Changeset c0ccccd for tools

Timestamp:

09/20/11 14:23:33 (10 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:

979a84f4

Parents:

c0506ea

Message:

• Updated libtrace tools to use trace_interrupt where appropriate
• Halved the number of calls to trace_get_wire_length in tracestats

Location:

tools

Files:

• traceends/traceends.cc (modified) (1 diff)
• tracemerge/tracemerge.c (modified) (1 diff)
• tracereport/tracereport.c (modified) (1 diff)
• tracesplit/tracesplit.c (modified) (1 diff)
• tracestats/tracestats.c (modified) (5 diffs)

tools/traceends/traceends.cc

@@ -83 +83 @@
         (void)sig;
         done=1;
+        trace_interrupt();
 }
 

tools/tracemerge/tracemerge.c

@@ -30 +30 @@
 {
         done=1;
+        trace_interrupt();
 }
 

tools/tracereport/tracereport.c

@@ -58 +58 @@
 {
         done=1;
+        trace_interrupt();
 }
 

tools/tracesplit/tracesplit.c

@@ -71 +71 @@
         (void)sig;
         done=1;
+        trace_interrupt();
 }
 

tools/tracestats/tracestats.c

@@ -64 +64 @@
         (void)signal;
         done=1;
+        trace_interrupt();
 }
 
@@ -102 +103 @@
         for (;;) {
                 int psize;
+                int wlen;
                 if ((psize = trace_read_packet(trace, packet)) <1) {
                         break;
@@ -108 +110 @@
                 if (done)
                         break;
+                wlen = trace_get_wire_length(packet);
 
                 for(i=0;i<filter_count;++i) {
@@ -114 +117 @@
                         if(trace_apply_filter(filters[i].filter,packet) > 0) {
                                 ++filters[i].count;
-                                filters[i].bytes+=trace_get_wire_length(packet);
+                                filters[i].bytes+=wlen;
                         }
                         if (trace_is_err(trace)) {
@@ -124 +127 @@
 
                 ++count;
-                bytes+=trace_get_wire_length(packet);
+                bytes+=wlen;
         }