Changeset c70f59f for lib/trace.c

Timestamp:

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

File:

• lib/trace.c (modified) (1 diff)

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;