Changeset 4423dc7 for tools

Timestamp:

12/03/07 23:11:00 (14 years ago)

Author:

Perry Lorier <perry@…>

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:

fdc7502

Parents:

25024fd

Message:

Add support to various tools for outputting the number of dropped packets
they've seen

Location:

tools

Files:

• tracereport/Makefile.am (modified) (1 diff)
• tracereport/drops_report.c (added)
• tracereport/report.h (modified) (2 diffs)
• tracereport/tracereport.c (modified) (4 diffs)
• tracereport/tracereport.h (modified) (1 diff)
• tracesplit/tracesplit.c (modified) (5 diffs)
• tracestats/tracestats.c (modified) (2 diffs)

tools/tracereport/Makefile.am

@@ -26 +26 @@
         ecn_report.c\
         tcpsegment_report.c\
+        drops_report.c\
         contain.h\
         report.h\

tools/tracereport/report.h

@@ -16 +16 @@
 void tcpseg_per_packet(struct libtrace_packet_t *packet);
 
+void drops_per_trace(libtrace_t *trace);
+
 void dir_report(void);
 void error_report(void);
@@ -29 +31 @@
 void ecn_report(void);
 void tcpseg_report(void);
+void drops_report(void);
 
 #endif

tools/tracereport/tracereport.c

@@ -120 +120 @@
                         tcpseg_per_packet(packet);
         }
+        if (reports_required & REPORT_TYPE_DROPS)
+                drops_per_trace(trace);
         trace_destroy(trace);
 }
@@ -158 +160 @@
                 int option_index;
                 struct option long_options[] = {
+                        { "ecn",                0, 0, 'C' },
+                        { "direction",          0, 0, 'd' },
+                        { "drops",              0, 0, 'D' },
+                        { "error",              0, 0, 'e' },
+                        { "flow",               0, 0, 'F' },
                         { "filter",             1, 0, 'f' },
                         { "help",               0, 0, 'H' },
-                        { "error",              0, 0, 'e' },
-                        { "flow",               0, 0, 'F' },
+                        { "misc",               0, 0, 'm' },
+                        { "nlp",                0, 0, 'n' },
+                        { "tcpoptions",         0, 0, 'O' },
+                        { "synoptions",         0, 0, 'o' },
                         { "protocol",           0, 0, 'P' },
                         { "port",               0, 0, 'p' },
-                        { "misc",               0, 0, 'm' },
+                        { "tcpsegment",         0, 0, 's' },
                         { "tos",                0, 0, 'T' },
                         { "ttl",                0, 0, 't' },
-                        { "tcpoptions",         0, 0, 'O' },
-                        { "synoptions",         0, 0, 'o' },
-                        { "nlp",                0, 0, 'n' },
-                        { "direction",          0, 0, 'd' },
-                        { "ecn",                0, 0, 'C' },
-                        { "tcpsegment",         0, 0, 's' },
                         { NULL,                 0, 0, 0 }
                 };
-                opt = getopt_long(argc, argv, "f:HemFPpTtOondCsl:", 
+                opt = getopt_long(argc, argv, "Df:HemFPpTtOondCsl:", 
                                 long_options, &option_index);
                 if (opt == -1)
@@ -186 +189 @@
                         case 'd':
                                 reports_required |= REPORT_TYPE_DIR;
+                                break;
+                        case 'D':
+                                reports_required |= REPORT_TYPE_DROPS;
                                 break;
                         case 'e':
@@ -284 +290 @@
         if (reports_required & REPORT_TYPE_TCPSEG)
                 tcpseg_report();
+        if (reports_required & REPORT_TYPE_DROPS)
+                drops_report();
         return 0;
 }

tools/tracereport/tracereport.h

@@ -21 +21 @@
         REPORT_TYPE_SYNOPT = 1 << 11,
         REPORT_TYPE_LOCALITY = 1 << 12, /* No longer used by libtrace */
-        REPORT_TYPE_MISC = 1 << 13
+        REPORT_TYPE_MISC = 1 << 13,
+        REPORT_TYPE_DROPS = 1<< 14
 } report_type_t;
 

tools/tracesplit/tracesplit.c

@@ -39 +39 @@
         "-H --libtrace-help     Print libtrace runtime documentation\n"
         "-S --snaplen           Snap packets at the specified length\n"
+        "-v --verbose           Output statistics\n"
         ,argv0);
         exit(1);
@@ -70 +71 @@
         uint64_t filescreated = 0;
         uint16_t snaplen = 0;
+        int verbose=0;
         
         if (argc<2) {
@@ -89 +91 @@
                         { "maxfiles",      1, 0, 'm' },
                         { "snaplen",       1, 0, 'S' },
+                        { "verbose",       0, 0, 'v' },
                         { NULL,            0, 0, 0   },
                 };
 
-                int c=getopt_long(argc, argv, "f:c:b:s:e:i:m:S:H",
+                int c=getopt_long(argc, argv, "f:c:b:s:e:i:m:S:Hv",
                                 long_options, &option_index);
 
@@ -118 +121 @@
                                   trace_help();
                                   exit(1);
+                                  break;
+                        case 'v':
+                                  verbose++;
                                   break;
                         default:
@@ -250 +256 @@
                 trace_perror(input, "Reading packets");
         }
+
+        if (verbose) {
+                uint64_t f;
+                f=trace_get_received_packets(input);
+                if (f!=UINT64_MAX)
+                        fprintf(stderr,"%" PRIu64 " packets on input\n",f);
+                f=trace_get_filtered_packets(input);
+                if (f!=UINT64_MAX)
+                        fprintf(stderr,"%" PRIu64 " packets filtered\n",f);
+                f=trace_get_dropped_packets(input);
+                if (f!=UINT64_MAX)
+                        fprintf(stderr,"%" PRIu64 " packets dropped\n",f);
+                f=trace_get_accepted_packets(input);
+                if (f!=UINT64_MAX)
+                        fprintf(stderr,"%" PRIu64 " packets accepted\n",f);
+        }
         
         trace_destroy(input);

tools/tracestats/tracestats.c

@@ -85 +85 @@
         uint64_t count = 0;
         uint64_t bytes = 0;
+        uint64_t packets;
 
         fprintf(stderr,"%s:\n",uri);
@@ -134 +135 @@
                 filters[i].count=0;
         }
+        packets=trace_get_received_packets(trace);
+        if (packets!=UINT64_MAX)
+                fprintf(stderr,"%30s:\t%12" PRIu64"\n", 
+                                "Input packets", packets);
+        packets=trace_get_filtered_packets(trace);
+        if (packets!=UINT64_MAX)
+                fprintf(stderr,"%30s:\t%12" PRIu64"\n", 
+                                "Filtered packets", packets);
+        packets=trace_get_dropped_packets(trace);
+        if (packets!=UINT64_MAX)
+                fprintf(stderr,"%30s:\t%12" PRIu64"\n",
+                                "Dropped packets",packets);
+        packets=trace_get_accepted_packets(trace);
+        if (packets!=UINT64_MAX)
+                fprintf(stderr,"%30s:\t%12" PRIu64 "\n",
+                                "Accepted Packets",packets);
         printf("%30s:\t%12"PRIu64"\t%12" PRIu64 "\n","Total",count,bytes);
         totcount+=count;