Changeset 963b13b

Timestamp:

03/18/15 16:33:17 (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:

6b98325

Parents:

1407294

Message:

Reset statistics and first packets on restart

File:

• lib/trace_parallel.c (modified) (2 diffs)

lib/trace_parallel.c

@@ -1274 +1274 @@
 static int trace_prestart(libtrace_t * libtrace, void *global_blob,
                           fn_per_pkt per_pkt, fn_reporter reporter) {
-        int err = 0;
+        int i, err = 0;
         if (libtrace->state != STATE_PAUSED) {
                 trace_set_err(libtrace, TRACE_ERR_BAD_STATE,
@@ -1282 +1282 @@
         }
 
+        assert(libtrace_parallel);
+        assert(!libtrace->perpkt_thread_states[THREAD_RUNNING]);
+
+        /* Reset first packets */
+        pthread_spin_lock(&libtrace->first_packets.lock);
+        for (i = 0; i < libtrace->perpkt_thread_count; ++i) {
+                assert(!!libtrace->perpkt_threads[i].recorded_first == !!libtrace->first_packets.packets[i].packet);
+                if (libtrace->first_packets.packets[i].packet) {
+                        trace_destroy_packet(libtrace->first_packets.packets[i].packet);
+                        libtrace->first_packets.packets[i].packet = NULL;
+                        libtrace->first_packets.packets[i].tv.tv_sec = 0;
+                        libtrace->first_packets.packets[i].tv.tv_usec = 0;
+                        libtrace->first_packets.count--;
+                        libtrace->perpkt_threads[i].recorded_first = false;
+                }
+        }
+        assert(libtrace->first_packets.count == 0);
+        libtrace->first_packets.first = 0;
+        pthread_spin_unlock(&libtrace->first_packets.lock);
+
+        /* Reset delay */
+        for (i = 0; i < libtrace->perpkt_thread_count; ++i) {
+                libtrace->perpkt_threads[i].tracetime_offset_usec = 0;
+        }
+
+        /* Reset statistics */
+        for (i = 0; i < libtrace->perpkt_thread_count; ++i) {
+                libtrace->perpkt_threads[i].accepted_packets = 0;
+                libtrace->perpkt_threads[i].filtered_packets = 0;
+        }
+        libtrace->accepted_packets = 0;
+        libtrace->filtered_packets = 0;
+
         /* Update functions if requested */
         if (per_pkt)
                 libtrace->per_pkt = per_pkt;
+        assert(libtrace->per_pkt);
         if (reporter)
                 libtrace->reporter = reporter;
         if(global_blob)
                 libtrace->global_blob = global_blob;
-
-        assert(libtrace_parallel);
-        assert(!libtrace->perpkt_thread_states[THREAD_RUNNING]);
-        assert(libtrace->per_pkt);
 
         if (libtrace->perpkt_thread_count > 1 &&