Changeset ac65c9f

Timestamp:

03/30/15 13:32:43 (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:

c723e9e

Parents:

91e016c

Message:

Fix bug in reporter dectecting per-packet threads finished too early finished, if stopped using trace_pstop.

Fix typo

Location:

lib

Files:

• libtrace_int.h (modified) (1 diff)
• trace.c (modified) (1 diff)
• trace_parallel.c (modified) (5 diffs)

lib/libtrace_int.h

@@ -237 +237 @@
         X(STATE_PAUSING) \
         X(STATE_PAUSED) \
-        X(STATE_FINSHED) \
+        X(STATE_FINISHED) \
+        X(STATE_FINISHING) \
         X(STATE_DESTROYED) \
         X(STATE_JOINED) \

lib/trace.c

@@ -2091 +2091 @@
         /* If the trace has paused or finished get the cached results */
         if (trace->state == STATE_PAUSED ||
-            trace->state == STATE_FINSHED ||
+            trace->state == STATE_FINISHED ||
+            trace->state == STATE_FINISHING ||
             trace->state == STATE_JOINED) {
                 if (trace->stats && trace->stats != stat)

lib/trace_parallel.c

@@ -250 +250 @@
 
         if (trace->perpkt_thread_states[THREAD_FINISHED] == trace->perpkt_thread_count)
-                libtrace_change_state(trace, STATE_FINSHED, false);
+                libtrace_change_state(trace, STATE_FINISHED, false);
 
         pthread_cond_broadcast(&trace->perpkt_cond);
@@ -722 +722 @@
                                 case MESSAGE_DO_STOP:
                                         assert(trace->started == false);
-                                        assert(trace->state == STATE_FINSHED);
+                                        assert(trace->state == STATE_FINISHED);
                                         /* Mark the current packet as EOF */
                                         packet->error = 0;
@@ -1085 +1085 @@
         message.code = MESSAGE_TICK_INTERVAL;
 
-        while (trace->state != STATE_FINSHED) {
+        while (trace->state != STATE_FINISHED) {
                 fd_set rfds;
                 next_release = tv_to_usec(&prev) + (trace->config.tick_interval * 1000);
@@ -1914 +1914 @@
         }
 
-        // Now release the threads and let them stop
-        libtrace_change_state(libtrace, STATE_FINSHED, true);
+        /* Now release the threads and let them stop - when the threads finish
+         * the state will be set to finished */
+        libtrace_change_state(libtrace, STATE_FINISHING, true);
         return 0;
 }
@@ -2180 +2181 @@
 
 DLLEXPORT bool trace_has_finished(libtrace_t * libtrace) {
-        return libtrace->state == STATE_FINSHED || libtrace->state == STATE_JOINED;
+        return libtrace->state == STATE_FINISHED || libtrace->state == STATE_JOINED;
 }