Changeset 3899 for pjproject

Timestamp:

Dec 7, 2011 4:19:28 AM (12 years ago)

Author:

ming

Message:

Re #1420: Releases the mutex before invoking the callback from the worker thread.

File:

• pjproject/trunk/pjmedia/src/pjmedia/event.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/event.c

@@ -88 +88 @@
 static pj_status_t event_mgr_distribute_events(pjmedia_event_mgr *mgr,
                                                event_queue *ev_queue,
-                                               esub **next_sub)
+                                               esub **next_sub,
+                                               pj_bool_t rls_lock)
 {
     pj_status_t err = PJ_SUCCESS;
@@ -101 +102 @@
          */
         if (sub->epub == ev->epub || !sub->epub) {
-            pj_status_t status = (*sub->cb)(ev, sub->user_data);
+            pjmedia_event_cb *cb = sub->cb;
+            void *user_data = sub->user_data;
+            pj_status_t status;
+            
+            if (rls_lock)
+                pj_mutex_unlock(mgr->mutex);
+
+            status = (*cb)(ev, user_data);
             if (status != PJ_SUCCESS && err == PJ_SUCCESS)
                 err = status;
+
+            if (rls_lock)
+                pj_mutex_lock(mgr->mutex);
         }
         sub = *next_sub;
@@ -128 +139 @@
 
         pj_mutex_lock(mgr->mutex);
-        event_mgr_distribute_events(mgr, &mgr->ev_queue, &mgr->th_next_sub);
+        event_mgr_distribute_events(mgr, &mgr->ev_queue,
+                                    &mgr->th_next_sub, PJ_TRUE);
         pj_mutex_unlock(mgr->mutex);
     }
@@ -347 +359 @@
             do {
                 status = event_mgr_distribute_events(mgr, mgr->pub_ev_queue,
-                                                     &mgr->pub_next_sub);
+                                                     &mgr->pub_next_sub,
+                                                     PJ_FALSE);
                 if (status != PJ_SUCCESS && err == PJ_SUCCESS)
                     err = status;