Changeset 3854

Timestamp:

Oct 25, 2011 12:12:44 PM (13 years ago)

Author:

bennylp

Message:

More re #1394: handle the case when clock_stop() is called from within the clock callback itself

File:

• pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c

@@ -222 +222 @@
     clock->quitting = PJ_FALSE;
 
-    if ((clock->options & PJMEDIA_CLOCK_NO_ASYNC) == 0) {
+    if ((clock->options & PJMEDIA_CLOCK_NO_ASYNC) == 0 && !clock->thread) {
         status = pj_thread_create(clock->pool, "clock", &clock_thread, clock,
                                   0, 0, &clock->thread);
@@ -246 +246 @@
 
     if (clock->thread) {
-        pj_thread_join(clock->thread);
-        clock->thread = NULL;
+        if (pj_thread_join(clock->thread) == PJ_SUCCESS) {
+            clock->thread = NULL;
+        } else {
+            clock->quitting = PJ_FALSE;
+        }
     }
 
@@ -375 +378 @@
             (*clock->cb)(&clock->timestamp, clock->user_data);
 
+        /* Best effort way to detect if we've been destroyed in the callback */
+        if (clock->quitting)
+            break;
+
         /* Increment timestamp */
         clock->timestamp.u64 += clock->timestamp_inc;