From 91cac96690c0be959856dff6bfd8d6368fe3179e Mon Sep 17 00:00:00 2001 From: chafiol <antonin.chafiol@gmail.com> Date: Fri, 7 Feb 2020 14:22:42 +0100 Subject: [PATCH] struct data --- Algos_1/main.c | 2 ++ Algos_1/utils.c | 22 ++++++++++++++++++++++ Algos_1/utils.h | 12 +++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Algos_1/main.c b/Algos_1/main.c index 2ded197..d7a567c 100644 --- a/Algos_1/main.c +++ b/Algos_1/main.c @@ -11,6 +11,8 @@ int main(int argc, char **argv){ long tab[100]; int n = readToTab(tab, argv[2]); + struct data data; + initData(&data); printf("Base : "); for(int i = 0; i<n; i++){ printf("%ld,", tab[i]); diff --git a/Algos_1/utils.c b/Algos_1/utils.c index 6ab7286..1902e2c 100644 --- a/Algos_1/utils.c +++ b/Algos_1/utils.c @@ -30,4 +30,26 @@ int readToTab(long* tab, char* file){ read(fd,&temp,sizeof(char)); } return n-1; +} + +void initData(struct data* d){ + d->time = 0; + d->comparison = 0; + d->ct_fusion = 0; + d->ct_parse = 0; + d->write = 0; +} + +void generate_tab(long* t, int nb){ + int taille_tab = 0; + if(nb == NULL){ + taille_tab = (int)(random()+1)%100 + } + else{ + taille_tab = nb + } + + for(int i = 0; taille_tab<taille_tab; i++){ + + } } \ No newline at end of file diff --git a/Algos_1/utils.h b/Algos_1/utils.h index 18fe287..fa7b0b1 100644 --- a/Algos_1/utils.h +++ b/Algos_1/utils.h @@ -7,5 +7,15 @@ #include <unistd.h> #include <fcntl.h> #include <string.h> +#include <time.h> -int readToTab(long* tab, char* file); \ No newline at end of file +struct data { + time_t time; + unsigned int write; + unsigned int comparison; + unsigned int ct_fusion; + unsigned int ct_parse; +} + +int readToTab(long* tab, char* file); +void initData(struct data d*); \ No newline at end of file -- GitLab