Changeset 67e9e2e

Timestamp:

10/12/09 11:03:29 (11 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:

23e1258

Parents:

c3c2c0b

Message:

• Added a new "merge input" option to tracertstats that will create a single unified output from multiple inputs, rather than calling output_start for each input.

Location:

tools/tracertstats

Files:

• tracertstats.1 (modified) (2 diffs)
• tracertstats.c (modified) (10 diffs)

tools/tracertstats/tracertstats.1

@@ -8 +8 @@
 [ -c | --count count ]
 [ -o | --output-format csv,txt,png,html ]
+[ -m | --merge-inputs ]
 inputuri...
 .P
@@ -41 +42 @@
 .TP
 .PD 0
+.BI \-m 
+.TP
+.PD
+.BI \-\^\-merge-inputs
+Treats all inputs as a single input, resulting a single unified output rather
+than an output for each input. Works best with traces that are consecutive to
+create a single CSV, for instance.
+
+.TP
+.PD 0
 .BI \-o " format"
 .TP
 .PD
 .BI \-\^\-output\-format " format"
-Selects the output format
+Selects the output format.
 
 .RS

tools/tracertstats/tracertstats.c

@@ -64 +64 @@
 char *output_format=NULL;
 
+int merge_inputs = 0;
+
 struct filter_t {
         char *expr;
@@ -94 +96 @@
 }
 
+static void create_output(char *title) {
+        int i;
+        
+        output=output_init(title,output_format?output_format:"txt");
+        if (!output) {
+                fprintf(stderr,"Failed to create output file\n");
+                return;
+        }
+        output_add_column(output,"ts");
+        output_add_column(output,"packets");
+        output_add_column(output,"bytes");
+        for(i=0;i<filter_count;++i) {
+                char buff[1024];
+                snprintf(buff,sizeof(buff),"%s packets",filters[i].expr);
+                output_add_column(output,buff);
+                snprintf(buff,sizeof(buff),"%s bytes",filters[i].expr);
+                output_add_column(output,buff);
+        }
+        output_flush_headings(output);
+
+}
+
 /* Process a trace, counting packets that match filter(s) */
 static void run_trace(char *uri) 
@@ -104 +128 @@
         double ts = 0;
 
-        fprintf(stderr,"output format: '%s'\n",output_format);
-        output=output_init(uri,output_format?output_format:"txt");
-        if (!output) {
-                fprintf(stderr,"Failed to create output file\n");
-                return;
-        }
-        output_add_column(output,"ts");
-        output_add_column(output,"packets");
-        output_add_column(output,"bytes");
-        for(i=0;i<filter_count;++i) {
-                char buff[1024];
-                snprintf(buff,sizeof(buff),"%s packets",filters[i].expr);
-                output_add_column(output,buff);
-                snprintf(buff,sizeof(buff),"%s bytes",filters[i].expr);
-                output_add_column(output,buff);
-        }
-        output_flush_headings(output);
-
+        if (!merge_inputs) 
+                create_output(uri);
 
         trace = trace_create(uri);
@@ -148 +156 @@
                 
                 ts = trace_get_seconds(packet);
-                while (packet_interval!=UINT64_MAX
-                  &&(last_ts==0 || last_ts<ts)) {
-                        if (last_ts==0)
-                                last_ts=ts;
+
+                if (last_ts == 0)
+                        last_ts = ts;
+
+                while (packet_interval != UINT64_MAX && last_ts<ts) {
                         report_results(last_ts,count,bytes);
                         count=0;
@@ -177 +186 @@
 
         trace_destroy(trace);
-        output_destroy(output);
+
+        if (!merge_inputs)
+                output_destroy(output);
+
         trace_destroy_packet(packet);
 }
@@ -189 +201 @@
         "-o --output-format=txt|csv|html|png Reporting output format\n"
         "-f --filter=bpf        Apply BPF filter. Can be specified multiple times\n"
+        "-m --merge-inputs      Do not create separate outputs for each input trace\n"
         "-H --libtrace-help     Print libtrace runtime documentation\n"
         ,argv0);
@@ -196 +209 @@
 
         int i;
-
+        
         while(1) {
                 int option_index;
@@ -205 +218 @@
                         { "output-format",      1, 0, 'o' },
                         { "libtrace-help",      0, 0, 'H' },
+                        { "merge-inputs",       0, 0, 'm' },
                         { NULL,                 0, 0, 0   },
                 };
 
-                int c=getopt_long(argc, argv, "c:f:i:o:H",
+                int c=getopt_long(argc, argv, "c:f:i:o:Hm",
                                 long_options, &option_index);
 
@@ -233 +247 @@
                                 output_format=strdup(optarg);
                                 break;
+                        case 'm':
+                                merge_inputs = 1;
+                                break;
                         case 'H': 
                                   trace_help(); 
@@ -248 +265 @@
         }
 
+        if (optind >= argc)
+                return 0;
+
+        fprintf(stderr,"output format: '%s'\n",output_format);
+        
+        
+
+        if (merge_inputs) {
+                /* If we're merging the inputs, we only want to create all
+                 * the column headers etc. once rather than doing them once
+                 * per trace */
+
+                /* This is going to "name" the output based on the first 
+                 * provided URI - admittedly not ideal */
+                create_output(argv[optind]);
+
+        }
+                
         for(i=optind;i<argc;++i) {
                 run_trace(argv[i]);
         }
 
+        if (merge_inputs) {
+                /* Clean up after ourselves */
+                output_destroy(output);
+        }
+
+
         return 0;
 }