Changeset 3840

Timestamp:

Oct 24, 2011 8:49:42 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1394: Concurrency problem when stopping clock thread

File:

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

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

@@ -110 +110 @@
 struct pjmedia_clock
 {
+    pj_pool_t               *pool;
     pj_timestamp             freq;
     pj_timestamp             interval;
@@ -165 +166 @@
                      p_clock, PJ_EINVAL);
 
+    pool = pj_pool_create(pool->factory, "clock%p", 512, 512, NULL);
+
     clock = PJ_POOL_ALLOC_T(pool, pjmedia_clock);
+    clock->pool = pool;
     
     status = pj_get_timestamp_freq(&clock->freq);
@@ -191 +195 @@
         return status;
 
+    *p_clock = clock;
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Start the clock. 
+ */
+PJ_DEF(pj_status_t) pjmedia_clock_start(pjmedia_clock *clock)
+{
+    pj_timestamp now;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(clock != NULL, PJ_EINVAL);
+
+    if (clock->running)
+        return PJ_SUCCESS;
+
+    status = pj_get_timestamp(&now);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    clock->next_tick.u64 = now.u64 + clock->interval.u64;
+    clock->running = PJ_TRUE;
+    clock->quitting = PJ_FALSE;
+
     if ((clock->options & PJMEDIA_CLOCK_NO_ASYNC) == 0) {
-        status = pj_thread_create(pool, "clock", &clock_thread, clock,
+        status = pj_thread_create(clock->pool, "clock", &clock_thread, clock,
                                   0, 0, &clock->thread);
         if (status != PJ_SUCCESS) {
@@ -200 +231 @@
     }
 
-
-    *p_clock = clock;
-
-    return PJ_SUCCESS;
-}
-
-
-/*
- * Start the clock. 
- */
-PJ_DEF(pj_status_t) pjmedia_clock_start(pjmedia_clock *clock)
-{
-    pj_timestamp now;
-    pj_status_t status;
-
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Stop the clock. 
+ */
+PJ_DEF(pj_status_t) pjmedia_clock_stop(pjmedia_clock *clock)
+{
     PJ_ASSERT_RETURN(clock != NULL, PJ_EINVAL);
 
-    if (clock->running)
-        return PJ_SUCCESS;
-
-    status = pj_get_timestamp(&now);
-    if (status != PJ_SUCCESS)
-        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;
-}
-
-
-/*
- * Stop the clock. 
- */
-PJ_DEF(pj_status_t) pjmedia_clock_stop(pjmedia_clock *clock)
-{
-    PJ_ASSERT_RETURN(clock != NULL, PJ_EINVAL);
-
     clock->running = PJ_FALSE;
+    clock->quitting = PJ_TRUE;
+
+    if (clock->thread) {
+        pj_thread_join(clock->thread);
+        clock->thread = NULL;
+    }
 
     return PJ_SUCCESS;
@@ -401 +409 @@
     }
 
-    return PJ_SUCCESS;
-}
-
-
+    if (clock->pool) {
+        pj_pool_t *pool = clock->pool;
+        clock->pool = NULL;
+        pj_pool_release(pool);
+    }
+    return PJ_SUCCESS;
+}
+
+