Changeset 673

Timestamp:

Aug 11, 2006 12:42:50 PM (18 years ago)

Author:

bennylp

Message:

Fixed bugs in previous deadlock workaround

Location:

pjproject/trunk

Files:

• pjmedia/build (modified) (1 prop)
• pjsip/src/pjsip/sip_dialog.c (modified) (4 diffs)
• pjsip/src/pjsip/sip_ua_layer.c (modified) (2 diffs)

pjproject/trunk/pjmedia/build

@@ -2 +2 @@
 *.opt
 .pjmedia*
+.pjsdp*
 *.plg
 *.vcproj*

@@ -2 +2 @@
 *.opt
 .pjmedia*
+.pjsdp*
 *.plg
 *.vcproj*

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -690 +690 @@
 PJ_DEF(void) pjsip_dlg_inc_lock(pjsip_dialog *dlg)
 {
+    PJ_LOG(6,(dlg->obj_name, "Entering pjsip_dlg_inc_lock(), sess_count=%d", 
+              dlg->sess_count));
+
     pjsip_ua_lock_dlg_table();
 
@@ -695 +698 @@
     dlg->sess_count++;
 
-    pjsip_ua_unlock_dlg_table();
+    //pjsip_ua_unlock_dlg_table();
+
+    PJ_LOG(6,(dlg->obj_name, "Leaving pjsip_dlg_inc_lock(), sess_count=%d", 
+              dlg->sess_count));
 }
 
@@ -705 +711 @@
 PJ_DEF(void) pjsip_dlg_dec_lock(pjsip_dialog *dlg)
 {
-    pjsip_ua_lock_dlg_table();
+    PJ_LOG(6,(dlg->obj_name, "Entering pjsip_dlg_dec_lock(), sess_count=%d", 
+              dlg->sess_count));
+
+    //pjsip_ua_lock_dlg_table();
 
     pj_assert(dlg->sess_count > 0);
@@ -719 +728 @@
 
     pjsip_ua_unlock_dlg_table();
+
+    PJ_LOG(6,(THIS_FILE, "Leaving pjsip_dlg_dec_lock() (dlg=%p)", dlg));
 }
 

pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

@@ -587 +587 @@
 
     /* Lock the dialog */
+    PJ_LOG(6,(dlg->obj_name, "UA layer acquiring dialog lock for request"));
     pjsip_dlg_inc_lock(dlg);
+
+    /* Pass to dialog. */
+    pjsip_dlg_on_rx_request(dlg, rdata);
+
+    /* Unlock the dialog. This may destroy the dialog */
+    pjsip_dlg_dec_lock(dlg);
 
     /* Done processing in the UA */
     pj_mutex_unlock(mod_ua.mutex);
-
-    /* Pass to dialog. */
-    pjsip_dlg_on_rx_request(dlg, rdata);
-
-    /* Unlock the dialog. This may destroy the dialog */
-    pjsip_dlg_dec_lock(dlg);
 
     /* Report as handled. */
@@ -783 +784 @@
 
     /* Acquire lock to the dialog. */
+    PJ_LOG(6,(dlg->obj_name, "UA layer acquiring dialog lock for response"));
     pjsip_dlg_inc_lock(dlg);
+
+    /* Pass the response to the dialog. */
+    pjsip_dlg_on_rx_response(dlg, rdata);
+
+    /* Unlock the dialog. This may destroy the dialog. */
+    pjsip_dlg_dec_lock(dlg);
 
     /* Unlock dialog hash table. */
     pj_mutex_unlock(mod_ua.mutex);
-
-    /* Pass the response to the dialog. */
-    pjsip_dlg_on_rx_response(dlg, rdata);
-
-    /* Unlock the dialog. This may destroy the dialog. */
-    pjsip_dlg_dec_lock(dlg);
 
     /* Done. */

@@ -2 +2 @@
 *.opt
 .pjmedia*
+.pjsdp*
 *.plg
 *.vcproj*