a

ping-report/src/stats.c

@@ -11,6 +11,59 @@
 #include "../include/stats.h"
 #include "../include/db-sqlite.h"
 
+
+
+
+
+
+void factorisation(){
+    /* Read file */
+    while(getline(&read_line,&n,fd) != -1){
+        
+        if(read_line == NULL){
+            break;
+        }
+
+        /* Exec regex to find ping */
+
+        if(regexec(p_reg,read_line,nmatch,pmatch,0) == 0){
+
+            /* Extract ping position from read line */
+            start = (int) pmatch[1].rm_so;
+            end = (int) pmatch[1].rm_eo;
+            size_ping = (size_t) (end - start);
+
+            /* ping string memory allocation */
+            ping = malloc(sizeof(char) * (size_ping+2));
+            if(ping == NULL){
+                free(read_line);
+                read_line = NULL;
+                n = 0;
+                break;
+            }
+
+            /* Create ping string */
+            (void) strncpy(ping, &read_line[start], size_ping);
+            ping[size_ping]='\n';
+            ping[size_ping+1]='\0';
+
+            /* Free memory */
+            free(read_line);
+            read_line = NULL;
+            n = 0;
+            break;
+        }
+
+        free(read_line);
+        read_line = NULL;
+        n = 0;
+    }
+}
+
+
+
+
+
 /*
     -- get_ping_from_temp_log --
     Desc :
@@ -67,47 +120,7 @@
         return ping; /* NULL */
     }
 
-    /* Read file */
-    while(getline(&read_line,&n,fd) != -1){
-        
-        if(read_line == NULL){
-            break;
-        }
-
-        /* Exec regex to find ping */
-
-        if(regexec(p_reg,read_line,nmatch,pmatch,0) == 0){
-
-            /* Extract ping position from read line */
-            start = (int) pmatch[1].rm_so;
-            end = (int) pmatch[1].rm_eo;
-            size_ping = (size_t) (end - start);
-
-            /* ping string memory allocation */
-            ping = malloc(sizeof(char) * (size_ping+2));
-            if(ping == NULL){
-                free(read_line);
-                read_line = NULL;
-                n = 0;
-                break;
-            }
-
-            /* Create ping string */
-            (void) strncpy(ping, &read_line[start], size_ping);
-            ping[size_ping]='\n';
-            ping[size_ping+1]='\0';
-
-            /* Free memory */
-            free(read_line);
-            read_line = NULL;
-            n = 0;
-            break;
-        }
-
-        free(read_line);
-        read_line = NULL;
-        n = 0;
-    }
+   factorisation();
 
     /* free allocated memory */
     regfree(p_reg);
@@ -171,6 +184,30 @@ void write_ping_log(char* new_ping){
     Return value :
         None
 */
+
+
+void remplacement(){
+
+                    /* Number of ping readed (for mean calculation) */
+                    nb_ping++;
+                    /* Max ping */
+                    if(ping > max){
+                        max = ping;
+                    }
+                    /* Min ping */
+                    if(ping < min){
+                        min = ping;
+                    }
+                    /* Number of ping above 100 ms */
+                    if(ping > 100.0){
+                        nb_high++;
+                    }
+                    /* Sum (for mean calculation) */
+                    sum += ping;
+                
+                
+}
+
 void set_stats_ping(){
     
     /* Variables */
@@ -203,28 +240,13 @@ void set_stats_ping(){
             if(strcmp(read_line,"LOSS") == 0){
                 nb_loss++;
             }else{
-                /* Evaluate the ping as a double */
+                 /* Evaluate the ping as a double */
                 ping = strtod(read_line,NULL);
                 /* Test null ping */
                 if(ping < 0.1){
                     /* Ignore null ping */
                 }else{
-                    /* Number of ping readed (for mean calculation) */
-                    nb_ping++;
-                    /* Max ping */
-                    if(ping > max){
-                        max = ping;
-                    }
-                    /* Min ping */
-                    if(ping < min){
-                        min = ping;
-                    }
-                    /* Number of ping above 100 ms */
-                    if(ping > 100.0){
-                        nb_high++;
-                    }
-                    /* Sum (for mean calculation) */
-                    sum += ping;
+                    remplacement();
                 }
             } 
             free(read_line);