Changeset 498 for pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c

Timestamp:

Jun 12, 2006 10:13:31 AM (17 years ago)

Author:

bennylp

Message:

Added mutex protection and option not to delete upstream/downstream port in master_port.c

File:

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

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

@@ -20 +20 @@
 #include <pjmedia/errno.h>
 #include <pj/assert.h>
+#include <pj/lock.h>
 #include <pj/os.h>
 #include <pj/pool.h>
@@ -42 +43 @@
     pj_bool_t                running;
     pj_bool_t                quitting;
+    pj_lock_t               *lock;
 };
 
@@ -83 +85 @@
     clock->quitting = PJ_FALSE;
     
+    /* I don't think we need a mutex, so we'll use null. */
+    status = pj_lock_create_null_mutex(pool, "clock", &clock->lock);
+    if (status != PJ_SUCCESS)
+        return status;
+
     status = pj_thread_create(pool, "clock", &clock_thread, clock,
                               0, 0, &clock->thread);
-    if (status != PJ_SUCCESS)
-        return status;
+    if (status != PJ_SUCCESS) {
+        pj_lock_destroy(clock->lock);
+        return status;
+    }
 
 
@@ -105 +114 @@
     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;
@@ -206 +220 @@
             continue;
 
+        pj_lock_acquire(clock->lock);
+
         /* Call callback, if any */
         if (clock->cb)
@@ -216 +232 @@
         clock->next_tick.u64 += clock->interval.u64;
 
-
+        pj_lock_release(clock->lock);
     }
 
@@ -239 +255 @@
     }
 
+    if (clock->lock) {
+        pj_lock_destroy(clock->lock);
+        clock->lock = NULL;
+    }
+
     return PJ_SUCCESS;
 }
 
 
-
-
-