Changeset 9c46b65 for lib

Timestamp:

12/07/18 15:31:11 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

1dc033a

Parents:

5097267

git-author:

Shane Alcock <salcock@…> (12/07/18 15:29:45)

git-committer:

Shane Alcock <salcock@…> (12/07/18 15:31:11)

Message:

Fix bug where trace_pstop had stopped working as intended.

Bug crept in as part of Jacob's assert fixes (and also slipped
past my review).

File:

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

lib/trace_parallel.c

@@ -410 +410 @@
                         return &libtrace->perpkt_threads[i];
         }
-        pthread_exit(NULL);
+        return NULL;
 }
 
@@ -653 +653 @@
         if (!t) {
                 trace_set_err(trace, TRACE_ERR_THREAD, "Unable to get thread table in perpkt_threads_entry()");
+                ASSERT_RET(pthread_mutex_unlock(&trace->libtrace_lock), == 0);
                 pthread_exit(NULL);
         }
@@ -2231 +2232 @@
         // Now send a message asking the threads to stop
         // This will be retrieved before trying to read another packet
-
         message.code = MESSAGE_DO_STOP;
         trace_message_perpkts(libtrace, &message);