Changeset 9346e4a

Timestamp:

09/10/15 16:40:56 (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:

d2df7c4

Parents:

c3cb9f9

Message:

Allow trace_pstop to be called by a reporter thread.

This will allow reporters to decide they've seen enough packets and
trigger a program exit.

This has the side-effect that trace_ppause can also be called by the
reporter successfully, but restarting the trace again is probably not
going to work as intended.

File:

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

lib/trace_parallel.c

@@ -1852 +1852 @@
         // Check state from within the lock if we are going to change it
         ASSERT_RET(pthread_mutex_lock(&libtrace->libtrace_lock), == 0);
+
+        /* If we are already paused, just treat this as a NOOP */
+        if (libtrace->state == STATE_PAUSED) {
+                ASSERT_RET(pthread_mutex_unlock(&libtrace->libtrace_lock), == 0);
+                return 0;
+        }
         if (!libtrace->started || libtrace->state != STATE_RUNNING) {
                 trace_set_err(libtrace,TRACE_ERR_BAD_STATE, "You must call trace_start() before calling trace_ppause()");
-                ASSERT_RET(pthread_mutex_unlock(&libtrace->libtrace_lock), == 0);
                 return -1;
         }
@@ -1921 +1926 @@
                 if (libtrace->config.debug_state)
                         fprintf(stderr, "Reporter thread is running, asking it to pause ...");
-                libtrace_message_t message = {0};
-                message.code = MESSAGE_DO_PAUSE;
-                trace_message_thread(libtrace, &libtrace->reporter_thread, &message);
-                // Wait for it to pause
-                ASSERT_RET(pthread_mutex_lock(&libtrace->libtrace_lock), == 0);
-                while (libtrace->reporter_thread.state == THREAD_RUNNING) {
-                        ASSERT_RET(pthread_cond_wait(&libtrace->perpkt_cond, &libtrace->libtrace_lock), == 0);
-                }
-                ASSERT_RET(pthread_mutex_unlock(&libtrace->libtrace_lock), == 0);
+                if (pthread_equal(pthread_self(), libtrace->reporter_thread.tid)) {
+                        libtrace->combiner.pause(libtrace, &libtrace->combiner);
+                        thread_change_state(libtrace, &libtrace->reporter_thread, THREAD_PAUSED, true);
+                
+                } else {
+                        libtrace_message_t message = {0};
+                        message.code = MESSAGE_DO_PAUSE;
+                        trace_message_thread(libtrace, &libtrace->reporter_thread, &message);
+                        // Wait for it to pause
+                        ASSERT_RET(pthread_mutex_lock(&libtrace->libtrace_lock), == 0);
+                        while (libtrace->reporter_thread.state == THREAD_RUNNING) {
+                                ASSERT_RET(pthread_cond_wait(&libtrace->perpkt_cond, &libtrace->libtrace_lock), == 0);
+                        }
+                        ASSERT_RET(pthread_mutex_unlock(&libtrace->libtrace_lock), == 0);
+                }
                 if (libtrace->config.debug_state)
                         fprintf(stderr, " DONE\n");