Changeset 904c639

Timestamp:

06/12/09 16:19:38 (12 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:

8365c66

Parents:

3fc7948

Message:

• Added a --count option to tracereport that will stop processing after N packets
• Ensure that when the "done" flag is set, we don't waste time opening and immediately closing any outstanding trace files
• Removed old code for "count" parameter that had been commented out

File:

• tools/tracereport/tracereport.c (modified) (10 diffs)

tools/tracereport/tracereport.c

@@ -51 +51 @@
 struct libtrace_t *trace;
 uint32_t reports_required = 0;
+int packets_read = 0;
 
 static volatile int done=0;
@@ -63 +64 @@
 {
         struct libtrace_packet_t *packet = trace_create_packet();
+
+        /* Already read the maximum number of packets - don't need to read
+         * anything from this trace */
+        if ((count >= 0 && packets_read >= count) || done)
+                return;
 
         trace = trace_create(uri);
@@ -80 +86 @@
         }
 
-        for (;;) {
+        while (1) {
                 int psize;
                 
-                /* Not convinced we need this count business */
-                /*
-                if (count--<1)
+                if (count >= 0 && packets_read >= count)
                         break;
-                */
                 if (done)
                         break;
@@ -119 +122 @@
                 if (reports_required & REPORT_TYPE_TCPSEG)
                         tcpseg_per_packet(packet);
+
+                packets_read ++;
         }
         if (reports_required & REPORT_TYPE_DROPS)
@@ -130 +135 @@
         "%s flags traceuri [traceuri...]\n"
         "-f --filter=bpf        \tApply BPF filter. Can be specified multiple times\n"
+        "-c --count=N           Stop after reading N packets\n"
         "-e --error             Report packet errors (e.g. checksum failures, rxerrors)\n"
         "-F --flow              Report flows\n"
@@ -154 +160 @@
         char *filterstring=NULL;
         struct sigaction sigact;
+        int count = -1;
 
         libtrace_filter_t *filter = NULL;/*trace_bpf_setfilter(filterstring); */
@@ -160 +167 @@
                 int option_index;
                 struct option long_options[] = {
+                        { "count",              1, 0, 'c' },
                         { "ecn",                0, 0, 'C' },
                         { "direction",          0, 0, 'd' },
@@ -178 +186 @@
                         { NULL,                 0, 0, 0 }
                 };
-                opt = getopt_long(argc, argv, "Df:HemFPpTtOondCsl:", 
+                opt = getopt_long(argc, argv, "Df:HemFPpTtOondCsc:", 
                                 long_options, &option_index);
                 if (opt == -1)
@@ -184 +192 @@
                 
                 switch (opt) {
+                        case 'c':
+                                count = atoi(optarg);
+                                break;
                         case 'C':
                                 reports_required |= REPORT_TYPE_ECN;
@@ -261 +272 @@
                  * genuine output at the moment */
                 fprintf(stderr, "Reading from trace: %s\n", argv[i]);
-                run_trace(argv[i],filter,(1<<30));
+                run_trace(argv[i],filter, count);
         }