Changeset 02d13cb

Timestamp:

03/01/18 17:10:50 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, etsilive, master, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

43b773a

Parents:

207e288

Message:

Don't count ERF provenance records during tracestats, tracertstats

Or any other records with 0 wire length for that matter.

This was especially off-putting when using filters as provenance
records automatically match all filters, so you could get some
very misleading results.

Location:

tools

Files:

• tracertstats/tracertstats.c (modified) (2 diffs)
• tracestats/tracestats.c (modified) (2 diffs)

tools/tracertstats/tracertstats.c

@@ -197 +197 @@
         thread_data_t *td = (thread_data_t *)tls;
         int i;
+        size_t wlen;
 
         if (IS_LIBTRACE_META_PACKET(packet)) {
@@ -212 +213 @@
                                 sizeof(statistic_t) * filter_count);
         }
+        wlen = trace_get_wire_length(packet);
+        if (wlen == 0) {
+                /* Don't count ERF provenance and similar packets */
+                return packet;
+        }
         for(i=0;i<filter_count;++i) {
                 if(trace_apply_filter(filters[i].filter, packet)) {
                         td->results->filters[i].count++;
-                        td->results->filters[i].bytes+=trace_get_wire_length(packet);
+                        td->results->filters[i].bytes+=wlen;
                 }
         }
 
         td->results->total.count++;
-        td->results->total.bytes +=trace_get_wire_length(packet);
+        td->results->total.bytes += wlen;
         return packet;
 }

tools/tracestats/tracestats.c

@@ -105 +105 @@
         libtrace_stat_t *stats = NULL;
         int i;
+        double pct;
 
         stats = trace_get_statistics(trace, NULL);
-        printf("%-30s\t%12s\t%12s\t%7s\n","filter","count","bytes","%");
+        printf("%-30s\t%12s\t%12s\t%7s\n","filter","count","bytes","% count");
         for(i=0;i<filter_count;++i) {
-                printf("%30s:\t%12"PRIu64"\t%12"PRIu64"\t%7.03f\n",filters[i].expr,counters[i+1].count,counters[i+1].bytes,counters[i+1].count*100.0/counters[0].count);
+                if (counters[0].count == 0) {
+                        pct = 0.0;
+                } else {
+                        pct = counters[i+1].count*100.0/counters[0].count;
+                }
+                printf("%30s:\t%12"PRIu64"\t%12"PRIu64"\t%7.03f\n",filters[i].expr,counters[i+1].count,counters[i+1].bytes,pct);
         }
         if (stats->received_valid)
@@ -160 +166 @@
         /* Apply filters to every packet note the result */
         wlen = trace_get_wire_length(pkt);
+        if (wlen == 0) {
+                /* Don't count ERF provenance etc. */
+                return pkt;
+        }
         for(i=0;i<filter_count;++i) {
                 if (filters[i].filter == NULL)