Changeset 4410

Timestamp:

Mar 1, 2013 3:46:45 AM (12 years ago)

Author:

nanang

Message:

Re 1394 and re #1531: backported to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjlib/src/pj/os_core_win32.c (modified) (1 diff)
• pjmedia/src/pjmedia/clock_thread.c (modified) (7 diffs)

pjproject/branches/1.x/pjlib/src/pj/os_core_win32.c

@@ -580 +580 @@
     PJ_ASSERT_RETURN(p, PJ_EINVAL);
 
+    if (p == pj_thread_this())
+        return PJ_ECANCELLED;
+
     PJ_LOG(6, (pj_thread_this()->obj_name, "Joining thread %s", p->obj_name));
 

pjproject/branches/1.x/pjmedia/src/pjmedia/clock_thread.c

@@ -32 +32 @@
 struct pjmedia_clock
 {
+    pj_pool_t               *pool;
     pj_timestamp             freq;
     pj_timestamp             interval;
@@ -71 +72 @@
 
     clock = PJ_POOL_ALLOC_T(pool, pjmedia_clock);
-
-    
+    clock->pool = pj_pool_create(pool->factory, "clock%p", 512, 512, NULL);
+
     status = pj_get_timestamp_freq(&clock->freq);
     if (status != PJ_SUCCESS)
@@ -95 +96 @@
         return status;
 
-    if ((clock->options & PJMEDIA_CLOCK_NO_ASYNC) == 0) {
-        status = pj_thread_create(pool, "clock", &clock_thread, clock,
-                                  0, 0, &clock->thread);
-        if (status != PJ_SUCCESS) {
-            pj_lock_destroy(clock->lock);
-            return status;
-        }
-    }
-
-
     *p_clock = clock;
 
@@ -128 +119 @@
         return status;
 
-    pj_lock_acquire(clock->lock);
     clock->next_tick.u64 = now.u64 + clock->interval.u64;
     clock->running = PJ_TRUE;
-    pj_lock_release(clock->lock);
-
-    return status;
+    clock->quitting = PJ_FALSE;
+
+    if ((clock->options & PJMEDIA_CLOCK_NO_ASYNC) == 0 && !clock->thread) {
+        status = pj_thread_create(clock->pool, "clock", &clock_thread, clock,
+                                  0, 0, &clock->thread);
+        if (status != PJ_SUCCESS) {
+            clock->running = PJ_FALSE;
+            return status;
+        }
+    }
+
+    return PJ_SUCCESS;
 }
 
@@ -145 +144 @@
 
     clock->running = PJ_FALSE;
+    clock->quitting = PJ_TRUE;
+
+    if (clock->thread) {
+        if (pj_thread_join(clock->thread) == PJ_SUCCESS) {
+            pj_thread_destroy(clock->thread);
+            clock->thread = NULL;
+            pj_pool_reset(clock->pool);
+        } else {
+            clock->quitting = PJ_FALSE;
+        }
+    }
 
     return PJ_SUCCESS;
@@ -255 +265 @@
             (*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;
@@ -289 +303 @@
     }
 
+    if (clock->pool) {
+        pj_pool_t *pool = clock->pool;
+        clock->pool = NULL;
+        pj_pool_release(pool);
+    }
     return PJ_SUCCESS;
 }