Changeset d2df7c4 for tools

Timestamp:

09/10/15 16:42:23 (6 years ago)

Author:

Shane Alcock <salcock@…>

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:

ab7e4ee

Parents:

9346e4a

Message:

Make -c option work for tracertstats

It's only an approximate stopping point (a lower bound to be exact), as we
only check whether we've passed the count in the reporting thread.

Removed references to tracertstats_parallel from Makefile.am

Location:

tools/tracertstats

Files:

• Makefile.am (modified) (2 diffs)
• tracertstats.1 (modified) (2 diffs)
• tracertstats.c (modified) (11 diffs)

tools/tracertstats/Makefile.am

@@ -1 @@
-bin_PROGRAMS = tracertstats tracertstats_parallel
+bin_PROGRAMS = tracertstats 
 man_MANS = tracertstats.1
 EXTRA_DIST = $(man_MANS)
@@ -16 +16 @@
 tracertstats_SOURCES = tracertstats.c output.h output.c $(OUTPUT_MODULES)
 tracertstats_LDADD = -ltrace $(OUTPUT_PNG_LD)
-tracertstats_parallel_SOURCES = tracertstats_parallel.c output.h output.c $(OUTPUT_MODULES)
-tracertstats_parallel_LDADD = -ltrace $(OUTPUT_PNG_LD)

tools/tracertstats/tracertstats.1

@@ -6 +6 @@
 [ -f | --filter bpf ]
 [ -i | --interval interval ]
+[ -t | --threads max ]
 [ -c | --count count ]
 [ -o | --output-format csv,txt,png,html ]
@@ -34 +35 @@
 .TP
 .PD 0
+.BI \-t " max"
+.TP
+.PD
+.BI \-\^\-threads " max"
+Use \fImax\fR packet processing threads. The default is 4 threads, but adding
+more or less threads may improve performance.
+
+.TP
+.PD 0
 .BI \-c " count"
 .TP
 .PD
 .BI \-\^\-count " count"
-Output results every \fIcount\fR packets.
+Stop after processing this amount of packets. Note that this is only a
+lower bound as this is only evaluated once per thread per interval.
 
 .TP

tools/tracertstats/tracertstats.c

@@ -63 +63 @@
 #define DEFAULT_OUTPUT_FMT "txt"
 
-struct libtrace_t *trace;
 char *output_format=NULL;
-
 int merge_inputs = 0;
 int threadcount = 4;
+int filter_count=0;
 
 struct filter_t {
@@ -75 +74 @@
         uint64_t bytes;
 } *filters = NULL;
-int filter_count=0;
-uint64_t totcount;
-uint64_t totbytes;
 
 uint64_t packet_count=UINT64_MAX;
 double packet_interval=UINT32_MAX;
-
 
 struct output_data_t *output = NULL;
@@ -135 +130 @@
 
 static uint64_t glob_last_ts = 0;
-static void process_result(libtrace_t *trace UNUSED, int mesg,
+static void process_result(libtrace_t *trace, int mesg,
                            libtrace_generic_t data,
                            libtrace_thread_t *sender UNUSED) {
-        static uint64_t ts = 0;
+        uint64_t ts = 0;
+        static bool stopped = false;
+        static uint64_t packets_seen = 0;
         int j;
         result_t *res;
+
+        if (stopped)
+                return;
 
         switch (mesg) {
@@ -157 +157 @@
                 }
                 count += res->total.count;
+                packets_seen += res->total.count;
                 bytes += res->total.bytes;
                 for (j = 0; j < filter_count; j++) {
@@ -164 +165 @@
                 free(res);
         }
+
+        /* Be careful to only call pstop once from within this thread! */
+        if (packets_seen > packet_count) {
+                trace_pstop(trace);
+                stopped = true;
+        }
 }
 
@@ -214 +221 @@
                         trace_publish_result(trace, t, last_key, tmp, RESULT_USER);
                         trace_post_reporter(trace);
-                        free(results);
                         results = NULL;
                 }
@@ -239 +245 @@
 static void run_trace(char *uri)
 {
+        libtrace_t *trace = NULL;
         if (!merge_inputs) 
                 create_output(uri);
@@ -253 +260 @@
                 return;
         }
-        /*
-        if (trace_start(trace)==-1) {
-                trace_perror(trace,"trace_start");
-                trace_destroy(trace);
-                if (!merge_inputs)
-                        output_destroy(output);
-                return;
-        }*/
         trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_t){0});
         trace_set_tracetime(trace, true);
         trace_set_perpkt_threads(trace, threadcount);
-
-        //trace_set_hasher(trace, HASHER_CUSTOM, &bad_hash, NULL);
 
         if (trace_get_information(trace)->live) {
@@ -294 +291 @@
        
 }
+
 // TODO Decide what to do with -c option
 static void usage(char *argv0)
@@ -300 +298 @@
         "%s flags libtraceuri [libtraceuri...]\n"
         "-i --interval=seconds  Duration of reporting interval in seconds\n"
-        "-c --count=packets     Exit after count packets received\n"
+        "-c --count=packets     Exit after count packets have been processed\n"
         "-t --threads=max       Create 'max' processing threads (default: 4)\n"
         "-o --output-format=txt|csv|html|png Reporting output format\n"
@@ -350 +348 @@
                                 break;
                         case 'c':
-                                packet_count=atoi(optarg);
+                                packet_count=strtoul(optarg, NULL, 10);
                                 break;
                         case 'o':