Changeset 5ab626a for tools/tracestats

Timestamp:

02/18/15 17:41:48 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

e4f27d1

Parents:

8bcc925

Message:

Deprecate trace_get_filtered/accepted/recevied/dropped() in favour of a single function

Adds the single trace_get_statistics function. This allows the structure to be filled
at a point in time, rather than making multiple calls to the library during which state
might have changed.

This has been designed such that the structure can be added to in the future without
breaking old code.

The old internal get_captured_packets was removed from the formats as it was never used.
Eventually we should completely remove get_filtered and received from the formats and replace
them with get_statistics.

In additon some extra fields have added, such as error and captured and the pre-existing
fields are better defined.

The linux formats have been updated to use this new API, which combined with reading
/proc/net/dev returns a full set of statistics.

Location:

tools/tracestats

Files:

• tracestats.c (modified) (3 diffs)
• tracestats_parallel.c (modified) (4 diffs)

tools/tracestats/tracestats.c

@@ -84 +84 @@
         uint64_t count = 0;
         uint64_t bytes = 0;
-        uint64_t packets;
+        libtrace_stat_t *stats;
 
         fprintf(stderr,"%s:\n",uri);
@@ -128 +128 @@
                 ++count;
                 bytes+=wlen;
-        }
+        }
+
+        stats = trace_get_statistics(trace, NULL);
 
         printf("%-30s\t%12s\t%12s\t%7s\n","filter","count","bytes","%");
@@ -136 +138 @@
                 filters[i].count=0;
         }
-        packets=trace_get_received_packets(trace);
-        if (packets!=UINT64_MAX)
+        if (stats->received_valid)
                 fprintf(stderr,"%30s:\t%12" PRIu64"\n", 
-                                "Input packets", packets);
-        packets=trace_get_filtered_packets(trace);
-        if (packets!=UINT64_MAX)
+                                "Input packets", stats->received);
+        if (stats->filtered_valid)
                 fprintf(stderr,"%30s:\t%12" PRIu64"\n", 
-                                "Filtered packets", packets);
-        packets=trace_get_dropped_packets(trace);
-        if (packets!=UINT64_MAX)
+                                "Filtered packets", stats->filtered);
+        if (stats->dropped_valid)
                 fprintf(stderr,"%30s:\t%12" PRIu64"\n",
-                                "Dropped packets",packets);
-        packets=trace_get_accepted_packets(trace);
-        if (packets!=UINT64_MAX)
+                                "Dropped packets",stats->dropped);
+        if (stats->accepted_valid)
                 fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
-                                "Accepted Packets",packets);
+                                "Accepted packets", stats->accepted);
+        if (stats->errors_valid)
+                fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
+                                "Erred packets", stats->errors);
         printf("%30s:\t%12"PRIu64"\t%12" PRIu64 "\n","Total",count,bytes);
         totcount+=count;

tools/tracestats/tracestats_parallel.c

@@ -132 +132 @@
                         case MESSAGE_STOPPING:
                                 trace_publish_result(trace, t, 0, (libtrace_generic_types_t){.ptr = results}, RESULT_NORMAL); // Only ever using a single key 0
-                                fprintf(stderr, "Thread published resuslts WOWW\n");
+                                //fprintf(stderr, "tracestats_parallel:\t Stopping thread - publishing results\n");
                                 break;
                         case MESSAGE_STARTING:
@@ -138 +138 @@
                                 break;
                         case MESSAGE_DO_PAUSE:
-                                fprintf(stderr, "GOT Asked to pause ahh\n");
+                                assert(!"GOT Asked to pause!!!\n");
                                 break;
                         case MESSAGE_PAUSING:
-                                fprintf(stderr, "Thread is pausing\n");
+                                //fprintf(stderr, "tracestats_parallel:\t pausing thread\n");
                                 break;
                         case MESSAGE_RESUMING:
-                                fprintf(stderr, "Thread has paused\n");
+                                //fprintf(stderr, "tracestats_parallel:\t resuming thread\n");
                                 break;
                 }
@@ -168 +168 @@
                 free(res);
         } else switch (mesg->code) {
+                libtrace_stat_t *stats;
                 case MESSAGE_STOPPING:
+                        stats = trace_get_statistics(trace, NULL);
                         printf("%-30s\t%12s\t%12s\t%7s\n","filter","count","bytes","%");
                         for(i=0;i<filter_count;++i) {
@@ -175 +177 @@
                                 filters[i].count=0;
                         }
-                        packets=trace_get_received_packets(trace);
-                        if (packets!=UINT64_MAX)
+                        if (stats->received_valid)
                                 fprintf(stderr,"%30s:\t%12" PRIu64"\n",
-                                                "Input packets", packets);
-                        packets=trace_get_filtered_packets(trace);
-                        if (packets!=UINT64_MAX)
+                                                "Input packets", stats->received);
+                        if (stats->filtered_valid)
                                 fprintf(stderr,"%30s:\t%12" PRIu64"\n",
-                                                "Filtered packets", packets);
-                        packets=trace_get_dropped_packets(trace);
-                        if (packets!=UINT64_MAX)
+                                                "Filtered packets", stats->filtered);
+                        if (stats->dropped_valid)
                                 fprintf(stderr,"%30s:\t%12" PRIu64"\n",
-                                                "Dropped packets",packets);
-                        packets=trace_get_accepted_packets(trace);
-                        if (packets!=UINT64_MAX)
+                                                "Dropped packets",stats->dropped);
+                        if (stats->accepted_valid)
                                 fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
-                                                "Accepted Packets",packets);
+                                                "Accepted packets", stats->accepted);
+                        if (stats->errors_valid)
+                                fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
+                                                "Erred packets", stats->errors);
                         printf("%30s:\t%12"PRIu64"\t%12" PRIu64 "\n","Total",count,bytes);
                         totcount+=count;