Changeset 246 for pjproject/trunk

Timestamp:

Feb 27, 2006 11:53:34 PM (19 years ago)

Author:

bennylp

Message:

Fixed deadlock in conference when starting sound device in Linux

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -31 +31 @@
 #ifdef CONF_DEBUG
 #   include <stdio.h>
-#   define TRACE_(x)   printf x
+#   define TRACE_(x)   {printf x; fflush(stdout); }
 #else
 #   define TRACE_(x)
@@ -267 +267 @@
 
     /* Create mutex. */
-    status = pj_mutex_create_simple(pool, "conf", &conf->mutex);
+    status = pj_mutex_create_recursive(pool, "conf", &conf->mutex);
     if (status != PJ_SUCCESS)
         return status;
@@ -461 +461 @@
 {
     struct conf_port *src_port, *dst_port;
+    pj_bool_t start_sound = PJ_FALSE;
 
     /* Check arguments */
@@ -481 +482 @@
 
         if (conf->connect_cnt == 1)
-            resume_sound(conf);
+            start_sound = 1;
 
         PJ_LOG(4,(THIS_FILE,"Port %.*s transmitting to port %.*s",
@@ -491 +492 @@
 
     pj_mutex_unlock(conf->mutex);
+
+    /* Sound device must be started without mutex, otherwise the
+     * sound thread will deadlock (?)
+     */
+    if (start_sound)
+        resume_sound(conf);
 
     return PJ_SUCCESS;
@@ -681 +688 @@
     PJ_UNUSED_ARG(size);
 
+    pj_mutex_lock(conf->mutex);
+
     TRACE_(("p"));
-
-    pj_mutex_lock(conf->mutex);
 
     /* Zero all port's temporary buffers. */
@@ -914 +921 @@
 
     /* Skip if this port is muted/disabled. */
-    if (snd_port->rx_setting != PJMEDIA_PORT_ENABLE)
+    if (snd_port->rx_setting != PJMEDIA_PORT_ENABLE) {
         return PJ_SUCCESS;
+    }
 
     /* Skip if no port is listening to the microphone */
-    if (snd_port->listener_cnt == 0)
+    if (snd_port->listener_cnt == 0) {
         return PJ_SUCCESS;
+    }