Changeset 729 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

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-apps/src/pjsua/pjsua_app.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1197 +1197 @@
     PJ_UNUSED_ARG(timer_heap);
 
+    if (call_id == PJSUA_INVALID_ID) {
+        PJ_LOG(1,(THIS_FILE, "Invalid call ID in timer callback"));
+        return;
+    }
+    
     /* Add warning header */
     pjsua_msg_data_init(&msg_data);