From 870450fe8409ce740fcda9011fd76c42889915c7 Mon Sep 17 00:00:00 2001 From: Landrin Dylan Date: Tue, 17 Sep 2024 12:14:25 +0200 Subject: [PATCH] =?UTF-8?q?premiere=20fonction=20de=20stats=20optimis?= =?UTF-8?q?=C3=A9=20a=205=20et=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ping-report/ping-report | Bin 0 -> 17920 bytes ping-report/ping-report.db | Bin 0 -> 8192 bytes ping-report/src/stats.c | 53 +++++++++++++++++++++---------------- 3 files changed, 30 insertions(+), 23 deletions(-) create mode 100755 ping-report/ping-report create mode 100644 ping-report/ping-report.db diff --git a/ping-report/ping-report b/ping-report/ping-report new file mode 100755 index 0000000000000000000000000000000000000000..39cf0ba43bb4c12b0b752a104bc40922a3625caa GIT binary patch literal 17920 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 GRsRJ(zEU9o literal 0 HcmV?d00001 diff --git a/ping-report/ping-report.db b/ping-report/ping-report.db new file mode 100644 index 0000000000000000000000000000000000000000..ee43589a828476a9cedd5cfc12006cd7c3dabe68 GIT binary patch literal 8192 zcmeH~!D`z;5QbNxkRoX5rSv)w0x>DRwAVtFSdI*`-AH!ao`hVhk&0~vS#6qY>801c zRc?Kx?5tL+-NeqdCCq}Pot=M2!?&XWMQ1@?rSPRFS4jnL*b8P^>^%Tu%$65_h=KMK zImd^k&38?0*8TeT8TZ-_W6y8+jRp}Q0z`la5CI}U1c<;tCGfj%@4ejLfBI+kJx{NC zNxr-e)61f)wCPFcxf2i02i^>{WpE=W@&fN<;s76hw-g)WMRNUGtPI_chko}mUth$l zIvHkuaAo!T-@K4q|hehj(UdYZVWx75O!qgiHbtnb>+2ywt#7a{ujr?zotijJauOfxK*tgwdFgf z;duH1jz5WGZ42k;TWjyt!GZPbs7mI`RNth}ZQ0Bw?s4E5A68uoO}B!6Fm@*}8uM!! z1a-C4&V2oV6TiD{TlHQ9gVEi{jT`&T18&)0wkTQ<(8FeJCN90m)!6HF@ZX&O^wS^$ cM1Tko0U|&IhyW2F0z`la5CI}U1RgPgTZ3$#WB>pF literal 0 HcmV?d00001 diff --git a/ping-report/src/stats.c b/ping-report/src/stats.c index 5b343e8..4b33689 100644 --- a/ping-report/src/stats.c +++ b/ping-report/src/stats.c @@ -32,9 +32,6 @@ regex_t *p_reg; regmatch_t* pmatch; char* ping = NULL; - int start; - int end; - size_t size_ping; /* regex struct memory allocation */ p_reg = (regex_t *) malloc(sizeof(*p_reg)); @@ -51,9 +48,9 @@ /* Construct regex to get ping from log file */ if(regcomp(p_reg,"time=(.*) ms",REG_EXTENDED) != 0){ - if(p_reg != NULL){ + //if(p_reg != NULL){ free(p_reg); - } + //} (void) fclose(fd); return ping; /* NULL */ } @@ -67,6 +64,28 @@ return ping; /* NULL */ } + ping = find_ping(read_line, n, fd); + + /* free allocated memory */ + regfree(p_reg); + free(p_reg); + free(pmatch); + //if(read_line != NULL){ + //free(read_line); + //} + + (void) fclose(fd); + + /* ping may be null, then it must mean that the ping request was lost */ + return ping; +} + +char* find_ping(char* read_line, size_t n, FILE* fd){ + int start; + int end; + size_t size_ping; + char* ping2 = NULL; + /* Read file */ while(getline(&read_line,&n,fd) != -1){ @@ -84,8 +103,8 @@ size_ping = (size_t) (end - start); /* ping string memory allocation */ - ping = malloc(sizeof(char) * (size_ping+2)); - if(ping == NULL){ + ping2 = malloc(sizeof(char) * (size_ping+2)); + if(ping2 == NULL){ free(read_line); read_line = NULL; n = 0; @@ -93,9 +112,9 @@ } /* Create ping string */ - (void) strncpy(ping, &read_line[start], size_ping); - ping[size_ping]='\n'; - ping[size_ping+1]='\0'; + (void) strncpy(ping2, &read_line[start], size_ping); + ping2[size_ping]='\n'; + ping2[size_ping+1]='\0'; /* Free memory */ free(read_line); @@ -107,20 +126,8 @@ free(read_line); read_line = NULL; n = 0; + return ping2; } - - /* free allocated memory */ - regfree(p_reg); - free(p_reg); - free(pmatch); - if(read_line != NULL){ - free(read_line); - } - - (void) fclose(fd); - - /* ping may be null, then it must mean that the ping request was lost */ - return ping; } /*