Changeset 729 for pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

Timestamp:

Sep 19, 2006 1:37:53 PM (18 years ago)

Author:

bennylp

Message:

Fixed race-condition/deadlock problems in the dialog/user agent layer
all the way up to PJSUA-API:

• standardized locking order: dialog then user agent, and dialog then PJSUA
• any threads that attempt to acquire mutexes in different order than above MUST employ retry mechanism (for an example, see acquire_call() in pjsua_call.c). This retry mechanism has also been used in the UA layer (sip_ua_layer.c) since it needs to lock user agent layer first before the dialog.
• introduced pjsip_dlg_try_inc_lock() and PJSUA_TRY_LOCK() to accomodate above.
• pjsua tested on Quad Xeon with 4 threads and 200 cps, so far so good.

File:

• pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h (modified) (1 diff)

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

@@ -258 +258 @@
 
 
-#if 0
-#define PJSUA_LOCK()        pj_mutex_lock(pjsua_var.mutex);
-#define PJSUA_UNLOCK()      pj_mutex_unlock(pjsua_var.mutex);
+#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)
 #else
 #define PJSUA_LOCK()
+#define PJSUA_TRY_LOCK()    PJ_SUCCESS
 #define PJSUA_UNLOCK()
 #endif