Changeset 1800ee3

Timestamp:

11/28/18 11:44:35 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

54642da

Parents:

8a12a49

git-author:

Shane Alcock <salcock@…> (11/28/18 11:43:25)

git-committer:

Shane Alcock <salcock@…> (11/28/18 11:44:35)

Message:

Add option to report packet drops to tracertstats.c

Note: this is going to report a cumulative counter rather
than the per-interval count that the rest of the columns do.

This can be fixed later, but will suffice for now.

File:

• tools/tracertstats/tracertstats.c (modified) (11 diffs)

tools/tracertstats/tracertstats.c

@@ -66 +66 @@
 int filter_count=0;
 int burstsize=10;
+uint8_t report_drops = 0;
 
 struct filter_t {
@@ -90 +91 @@
 }
 
-static void report_results(double ts,uint64_t count,uint64_t bytes)
+static void report_results(double ts,uint64_t count,uint64_t bytes,
+                libtrace_stat_t *stats)
 {
-        int i=0;
+        int i=0, offset = 3;
         output_set_data_time(output,0,ts);
         output_set_data_int(output,1,count);
         output_set_data_int(output,2,bytes);
+        if (stats) {
+                if (stats->dropped_valid) {
+                        output_set_data_int(output, 3, stats->dropped);
+                } else {
+                        output_set_data_int(output, 3, -1);
+                }
+                if (stats->missing_valid) {
+                        output_set_data_int(output, 4, stats->missing);
+                } else {
+                        output_set_data_int(output, 4, -1);
+                }
+                offset += 2;
+        }
         for(i=0;i<filter_count;++i) {
-                output_set_data_int(output,i*2+3,filters[i].count);
-                output_set_data_int(output,i*2+4,filters[i].bytes);
+                output_set_data_int(output,i*2+offset,filters[i].count);
+                output_set_data_int(output,i*2+offset+1,filters[i].bytes);
                 filters[i].count=filters[i].bytes=0;
         }
@@ -115 +130 @@
         output_add_column(output,"packets");
         output_add_column(output,"bytes");
+        if (report_drops) {
+                output_add_column(output, "dropped");
+                output_add_column(output, "missing");
+        }
         for(i=0;i<filter_count;++i) {
                 char buff[1024];
@@ -145 +164 @@
         int j;
         result_t *res;
+        libtrace_stat_t *stats = NULL;
 
         if (stopped)
@@ -153 +173 @@
         if (glob_last_ts == 0)
                 glob_last_ts = ts;
+        if (report_drops) {
+                stats = trace_create_statistics();
+                trace_get_statistics(trace, stats);
+        }
         while ((glob_last_ts >> 32) < (ts >> 32)) {
-                report_results(glob_last_ts >> 32, count, bytes);
+                report_results(glob_last_ts >> 32, count, bytes, stats);
                 count = 0;
                 bytes = 0;
@@ -169 +193 @@
         }
         free(res);
+        if (stats) {
+                free(stats);
+        }
 
         /* Be careful to only call pstop once from within this thread! */
@@ -261 +288 @@
         libtrace_t *trace = NULL;
         libtrace_callback_set_t *pktcbs, *repcbs;
+        libtrace_stat_t *stats = NULL;
 
         if (!merge_inputs) 
@@ -312 +340 @@
         
         // Flush the last one out
-        report_results((glob_last_ts >> 32), count, bytes);
+        if (report_drops) {
+                stats = trace_create_statistics();
+                stats = trace_get_statistics(trace, stats);
+        }
+        report_results((glob_last_ts >> 32), count, bytes, stats);
         if (trace_is_err(trace))
                 trace_perror(trace,"%s",uri);
 
+        if (stats) {
+                free(stats);
+        }
         trace_destroy(trace);
         trace_destroy_callback_set(pktcbs);
@@ -338 +373 @@
         "-N --nobuffer          Disable packet buffering within libtrace to force faster\n"
         "                       updates at very low traffic rates\n"
+        "-d --report-drops      Include statistics about number of packets dropped or\n"
+        "                       lost by the capture process\n"
         "-h --help      Print this usage statement\n"
         ,argv0);
@@ -358 +395 @@
                         { "threads",            1, 0, 't' },
                         { "nobuffer",           0, 0, 'N' },
+                        { "report-drops",       0, 0, 'd' },
                         { NULL,                 0, 0, 0   },
                 };
 
-                int c=getopt_long(argc, argv, "c:f:i:o:t:hmN",
+                int c=getopt_long(argc, argv, "c:f:i:o:t:dhmN",
                                 long_options, &option_index);
 
@@ -368 +406 @@
 
                 switch (c) {
+                        case 'd':
+                                report_drops = 1;
+                                break;
                         case 'N':
                                 burstsize = 1;