Changeset 1919caf

Timestamp:

01/09/15 09:22:03 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

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:

bdc8b36

Parents:

0a1d2d0

Message:

Fix received counter always displaying 0 rather than unknown.
Fix saving counters for the single threaded fast path.

Location:

lib

Files:

• trace.c (modified) (1 diff)
• trace_parallel.c (modified) (1 diff)

lib/trace.c

@@ -282 +282 @@
         libtrace->first_packets.packets = NULL;
         libtrace->dropped_packets = UINT64_MAX;
+        libtrace->received_packets = UINT64_MAX;
         ZERO_USER_CONFIG(libtrace->config);
 

lib/trace_parallel.c

@@ -1829 +1829 @@
         }
 
-        if (trace_supports_parallel(libtrace) && !trace_has_dedicated_hasher(libtrace)) {
-                uint64_t tmp_stats;
-                libtrace->dropped_packets = trace_get_dropped_packets(libtrace);
-                libtrace->received_packets = trace_get_received_packets(libtrace);
-                if (libtrace->format->get_filtered_packets) {
-                        if ((tmp_stats = libtrace->format->get_filtered_packets(libtrace)) != UINT64_MAX) {
-                                libtrace->filtered_packets += tmp_stats;
-                        }
-                }
+        /* Cache values before we pause */
+        libtrace->dropped_packets = trace_get_dropped_packets(libtrace);
+        libtrace->received_packets = trace_get_received_packets(libtrace);
+        uint64_t tmp_stats;
+        if (libtrace->format->get_filtered_packets) {
+                if ((tmp_stats = libtrace->format->get_filtered_packets(libtrace)) != UINT64_MAX) {
+                        libtrace->filtered_packets += tmp_stats;
+                }
+        }
+        if (trace_supports_parallel(libtrace) && !trace_has_dedicated_hasher(libtrace) && libtrace->perpkt_thread_count > 1) {
                 libtrace->started = false;
                 if (libtrace->format->ppause_input)