Changeset 3928

Timestamp:

Dec 28, 2011 9:49:24 AM (11 years ago)

Author:

nanang

Message:

Close #1434: Added PJSUA_LOCK_IS_LOCKED().

File:

• pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -367 +367 @@
     pj_pool_t           *pool;      /**< pjsua's private pool.          */
     pj_mutex_t          *mutex;     /**< Mutex protection for this data */
+    unsigned             mutex_nesting_level; /**< Mutex nesting level. */
+    pj_thread_t         *mutex_owner; /**< Mutex owner.                 */
     pjsua_state          state;     /**< Library state.                 */
 
@@ -503 +505 @@
 
 #if 1
-#define PJSUA_LOCK()        pj_mutex_lock(pjsua_var.mutex)
-#define PJSUA_TRY_LOCK()    pj_mutex_trylock(pjsua_var.mutex)
-#define PJSUA_UNLOCK()      pj_mutex_unlock(pjsua_var.mutex)
+
+PJ_INLINE(void) PJSUA_LOCK()
+{
+    pj_mutex_lock(pjsua_var.mutex);
+    pjsua_var.mutex_owner = pj_thread_this();
+    ++pjsua_var.mutex_nesting_level;
+}
+
+PJ_INLINE(void) PJSUA_UNLOCK()
+{
+    if (--pjsua_var.mutex_nesting_level == 0)
+        pjsua_var.mutex_owner = NULL;
+    pj_mutex_unlock(pjsua_var.mutex);
+}
+
+PJ_INLINE(pj_status_t) PJSUA_TRY_LOCK()
+{
+    pj_status_t status;
+    status = pj_mutex_trylock(pjsua_var.mutex);
+    if (status == PJ_SUCCESS) {
+        pjsua_var.mutex_owner = pj_thread_this();
+        ++pjsua_var.mutex_nesting_level;
+    }
+    return status;
+}
+
+PJ_INLINE(pj_bool_t) PJSUA_LOCK_IS_LOCKED()
+{
+    return pjsua_var.mutex_owner == pj_thread_this();
+}
+
 #else
 #define PJSUA_LOCK()
-#define PJSUA_TRY_LOCK()    PJ_SUCCESS
+#define PJSUA_TRY_LOCK()        PJ_SUCCESS
 #define PJSUA_UNLOCK()
+#define PJSUA_LOCK_IS_LOCKED()  PJ_TRUE
 #endif