Changeset c70f59f

Timestamp:

08/25/14 11:33:39 (6 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:

7fda5c5

Parents:

a79eae41

Message:

Don't increment accepted_packets in trace_event

For formats that use the normal trace_event_device and
trace_event_trace functions to implement trace_event functionality,
this was resulting in accepted_packets being incremented twice:
once in the call to trace_read_packet within the standard event
function and once again in trace_event.

Removed the increment from trace_event and updated all formats
that provide a custom trace_event implementation to make sure they
either call trace_read_packet themselves or update the counters
properly (with the former preferred wherever possible).

Thanks to Alistair King for finding this bug.

Location:

lib

Files:

• format_dag24.c (modified) (2 diffs)
• format_dag25.c (modified) (2 diffs)
• format_dpdk.c (modified) (1 diff)
• format_erf.c (modified) (1 diff)
• format_linux.c (modified) (1 diff)
• format_pcapfile.c (modified) (1 diff)
• format_rt.c (modified) (3 diffs)
• trace.c (modified) (1 diff)

lib/format_dag24.c

@@ -473 +473 @@
                         } else {
                                 /* Do not sleep - try to read another packet */
+                                trace->filtered_packets ++;
                                 continue;
                         }
@@ -483 +484 @@
                         trace_set_capture_length(packet, trace->snaplen);
                 }
-
+                trace->accepted_packets ++;
                 return event;
         } while (1);

lib/format_dag25.c

@@ -1134 +1134 @@
                                  * a sleep event in this case, like we used to
                                  * do! */
+                                trace->filtered_packets ++;
                                 trace_clear_cache(packet);
                                 continue;
@@ -1144 +1145 @@
                         trace_set_capture_length(packet, trace->snaplen);
                 }
+                trace->accepted_packets ++;
                 break;
         } while (1);

lib/format_dpdk.c

@@ -1272 +1272 @@
                 if (!trace_apply_filter(trace->filter, packet)) {
                     /* Failed the filter so we loop for another packet */
+                    trace->filtered_packets ++;
                     continue;
                 }
             }
+            trace->accepted_packets ++;
         } else {
             /* We only want to sleep for a very short time - we are non-blocking */

lib/format_erf.c

@@ -746 +746 @@
          * we just need to read and return the next packet in the trace */
         if (IN_OPTIONS.real_time) {
-                event.size = erf_read_packet(libtrace, packet);
+                event.size = trace_read_packet(libtrace, packet);
                 if (event.size < 1)
                         event.type = TRACE_EVENT_TERMINATE;

lib/format_linux.c

@@ -1099 +1099 @@
         if(header->tp_status & TP_STATUS_USER){
                 /* We have a frame waiting */
-                event.size = linuxring_read_packet(libtrace, packet);
+                event.size = trace_read_packet(libtrace, packet);
                 event.type = TRACE_EVENT_PACKET;
         } else {

lib/format_pcapfile.c

@@ -713 +713 @@
 
         if (IN_OPTIONS.real_time) {
-                event.size = pcapfile_read_packet(libtrace, packet);
+                event.size = trace_read_packet(libtrace, packet);
                 if (event.size < 1)
                         event.type = TRACE_EVENT_TERMINATE;

lib/format_rt.c

@@ -780 +780 @@
                         if (packet->type == TRACE_RT_END_DATA)
                                 event.type = TRACE_EVENT_TERMINATE;
-                        else
+                        else {
                                 /* Since several RT messages can have zero-byte
                                  * length (once the framing is removed), an 
@@ -786 +786 @@
                                  * PACKET event */
                                 event.type = TRACE_EVENT_PACKET;
+                                trace->accepted_packets ++;
+                        }
 
                 }       
                 else {
                         event.type = TRACE_EVENT_PACKET;
+                        trace->accepted_packets ++;
                 }
 
@@ -795 +798 @@
                         if (!trace_apply_filter(trace->filter, packet)) {
                                 trace_clear_cache(packet);
-                                continue;
+                                trace->filtered_packets ++;
+                                continue;
                         }
                 }

lib/trace.c

@@ -1119 +1119 @@
 
         if (packet->trace->format->trace_event) {
-                event=packet->trace->format->trace_event(trace,packet);
-                if (event.type == TRACE_EVENT_PACKET) {
-                        ++trace->accepted_packets;
-                }
+                /* Note: incrementing accepted, filtered etc. packet
+                 * counters is handled by the format-specific 
+                 * function so don't increment them here.
+                 */
+                event=packet->trace->format->trace_event(trace,packet);
         }
         return event;