Changeset ab7e4ee for tools

Timestamp:

09/10/15 16:58:22 (5 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:

8c7490fe

Parents:

d2df7c4

Message:

Minor tracertstats tweaks

• Replace useless -H option with a more standard -h option.
• Set default interval to 60 seconds (down from 5 minutes).

File:

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

tools/tracertstats/tracertstats.c

@@ -80 +80 @@
 struct output_data_t *output = NULL;
 
+uint64_t count;
+uint64_t bytes;
+
 static void report_results(double ts,uint64_t count,uint64_t bytes)
 {
@@ -115 +118 @@
 
 }
-
-uint64_t count;
-uint64_t bytes;
 
 typedef struct statistic {
@@ -303 +303 @@
         "-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"
+        "-h --help      Print this usage statement\n"
         ,argv0);
 }
@@ -318 +318 @@
                         { "count",              1, 0, 'c' },
                         { "output-format",      1, 0, 'o' },
-                        { "libtrace-help",      0, 0, 'H' },
+                        { "help",               0, 0, 'h' },
                         { "merge-inputs",       0, 0, 'm' },
                         { "threads",            1, 0, 't' },
@@ -324 +324 @@
                 };
 
-                int c=getopt_long(argc, argv, "c:f:i:o:t:Hm",
+                int c=getopt_long(argc, argv, "c:f:i:o:t:hm",
                                 long_options, &option_index);
 
@@ -357 +357 @@
                                 merge_inputs = 1;
                                 break;
-                        case 'H': 
-                                  trace_help(); 
-                                  exit(1); 
-                                  break;        
+                        case 'h':
+                                  usage(argv[0]);
+                                  return 1;
                         default:
                                 fprintf(stderr,"Unknown option: %c\n",c);
@@ -369 +368 @@
 
         if (packet_count == UINT64_MAX && packet_interval == UINT32_MAX) {
-                packet_interval = 300; /* every 5 minutes */
+                packet_interval = 60; /* every minute */
         }