Changeset 7be3cc4

Timestamp:

04/21/07 15:25:12 (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:

4df814d

Parents:

171cc28

Message:

Add start time, end time, duration, packets and packets per second reports.
Fixes #236
Make the default "all reports" instead of "no reports" for less surprise
value.

Location:

tools/tracereport

Files:

• Makefile.am (modified) (1 diff)
• misc_report.c (added)
• report.h (modified) (2 diffs)
• tracereport.1 (modified) (2 diffs)
• tracereport.c (modified) (7 diffs)
• tracereport.h (modified) (1 diff)

tools/tracereport/Makefile.am

@@ -16 +16 @@
         error_report.c\
         flow_report.c\
+        misc_report.c\
         port_report.c\
         protocol_report.c\

tools/tracereport/report.h

@@ -5 +5 @@
 void error_per_packet(struct libtrace_packet_t *packet);
 void flow_per_packet(struct libtrace_packet_t *packet);
+void misc_per_packet(struct libtrace_packet_t *packet);
 void port_per_packet(struct libtrace_packet_t *packet);
 void protocol_per_packet(struct libtrace_packet_t *packet);
@@ -18 +19 @@
 void error_report(void);
 void flow_report(void);
+void misc_report(void);
 void port_report(void);
 void protocol_report(void);

tools/tracereport/tracereport.1

@@ -7 +7 @@
 [ \fB-e \fR| \fB --error \fR]
 [ \fB-F \fR| \fB --flow \fR]
+[ \fB-m \fR| \fB --misc \fR]
 [ \fB-P \fR| \fB --protocol \fR]
 [ \fB-p \fR| \fB --port \fR]
@@ -49 +50 @@
 .BI \-\^\-flow
 Produces a report on the number of flows observed in the trace
+
+.TP
+.PD 0
+.BI \-m
+.TP
+.PD 0
+.BI \-\^\-misc
+Provides a report listing the time of the first packet, and the time of the
+last packet in the trace, the duration, the total number of packets in the 
+trace, and the average number of packets per second.
 
 .TP

tools/tracereport/tracereport.c

@@ -84 +84 @@
                         break;
                 }
+                if (reports_required & REPORT_TYPE_MISC)
+                        misc_per_packet(packet);
                 if (reports_required & REPORT_TYPE_ERROR)
                         error_per_packet(packet);
@@ -119 +121 @@
         "-e --error             Report packet errors (e.g. checksum failures, rxerrors)\n"
         "-F --flow              Report flows\n"
+        "-m --misc              Report misc information (start/end times, duration, pps)\n"
         "-P --protocol          Report transport protocols\n"
         "-p --port              Report port numbers\n"
@@ -151 +154 @@
                         { "protocol",           0, 0, 'P' },
                         { "port",               0, 0, 'p' },
+                        { "misc",               0, 0, 'm' },
                         { "tos",                0, 0, 'T' },
                         { "ttl",                0, 0, 't' },
@@ -161 +165 @@
                         { NULL,                 0, 0, 0 }
                 };
-                opt = getopt_long(argc, argv, "f:HeFPpTtOondCs", long_options,
+                opt = getopt_long(argc, argv, "f:HeFmPpTtOondCs", long_options,
                                 &option_index);
                 if (opt == -1)
@@ -194 +198 @@
                                 reports_required |= REPORT_TYPE_SYNOPT;
                                 break;
+                        case 'm':
+                                reports_required |= REPORT_TYPE_MISC;
+                                break;
                         case 'P':
                                 reports_required |= REPORT_TYPE_PROTO;
@@ -213 +220 @@
                 }
         }
+
+        /* Default to all reports, instead of no reports at all.  It's annoying
+         * waiting for 10 minutes for a trace to process then discover you 
+         * forgot to ask for any reports!
+         */
+        if (reports_required == 0)
+                reports_required = ~0;
 
         if (filterstring) {
@@ -227 +241 @@
         }
 
+        if (reports_required & REPORT_TYPE_MISC)
+                misc_report();
         if (reports_required & REPORT_TYPE_ERROR)
                 error_report();

tools/tracereport/tracereport.h

@@ -19 +19 @@
         REPORT_TYPE_ECN = 1 << 9,
         REPORT_TYPE_TCPSEG = 1 << 10,
-        REPORT_TYPE_SYNOPT = 1 << 11
+        REPORT_TYPE_SYNOPT = 1 << 11,
+        REPORT_TYPE_MISC = 1 << 12
 } report_type_t;