Changeset 5795

Timestamp:

May 23, 2018 1:33:00 AM (6 years ago)

Author:

ming

Message:

Fixed #2115: Deadlock between PJSUA LOCK and conference mutex

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -3761 +3761 @@
 {
     pjsua_call *call;
+    unsigned num_locks = 0;
 
     pj_log_push_indent();
@@ -3895 +3896 @@
     }
 
+    /* Release locks before calling callbacks, to avoid deadlock. */
+    while (PJSUA_LOCK_IS_LOCKED()) {
+        num_locks++;
+        PJSUA_UNLOCK();
+    }
+
     /* Ticket #1627: Invoke on_call_tsx_state() when call is disconnected. */
     if (inv->state == PJSIP_INV_STATE_DISCONNECTED &&
@@ -3907 +3914 @@
     if (pjsua_var.ua_cfg.cb.on_call_state)
         (*pjsua_var.ua_cfg.cb.on_call_state)(call->index, e);
+
+    /* Re-acquire the locks. */
+    for (;num_locks > 0; num_locks--)
+        PJSUA_LOCK();
 
     /* call->inv may be NULL now */