Changeset 3905

Timestamp:

Dec 9, 2011 5:15:39 AM (12 years ago)

Author:

ming

Message:

Re #1420: Create a pool for the event manager so subscriber doesn't need to supply its own pool.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/event.h (modified) (2 diffs)
• pjmedia/src/pjmedia/event.c (modified) (10 diffs)
• pjmedia/src/pjmedia/vid_port.c (modified) (2 diffs)
• pjmedia/src/pjmedia/vid_stream.c (modified) (1 diff)
• pjmedia/src/test/vid_codec_test.c (modified) (1 diff)
• pjmedia/src/test/vid_dev_test.c (modified) (1 diff)
• pjmedia/src/test/vid_port_test.c (modified) (1 diff)
• pjsip-apps/src/samples/aviplay.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (4 diffs)

pjproject/trunk/pjmedia/include/pjmedia/event.h

@@ -332 +332 @@
  *
  * @param mgr           The event manager.
- * @param pool          Pool to allocate memory from.
  * @param cb            The callback function to receive the event.
  * @param user_data     The user data to be associated with the callback
@@ -341 +340 @@
  */
 PJ_DECL(pj_status_t) pjmedia_event_subscribe(pjmedia_event_mgr *mgr,
-                                             pj_pool_t *pool,
                                              pjmedia_event_cb *cb,
                                              void *user_data,

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

@@ -50 +50 @@
 struct pjmedia_event_mgr
 {
+    pj_pool_t      *pool;
     pj_thread_t    *thread;             /**< worker thread.             */
     pj_bool_t       is_quitting;
@@ -57 +58 @@
     event_queue    *pub_ev_queue;       /**< publish() event queue.     */
     esub            esub_list;          /**< list of subscribers.       */
+    esub            free_esub_list;     /**< list of subscribers.       */
     esub           *th_next_sub,        /**< worker thread's next sub.  */
                    *pub_next_sub;       /**< publish() next sub.        */
@@ -155 +157 @@
 
     mgr = PJ_POOL_ZALLOC_T(pool, pjmedia_event_mgr);
+    mgr->pool = pj_pool_create(pool->factory, "evt mgr", 500, 500, NULL);
     pj_list_init(&mgr->esub_list);
+    pj_list_init(&mgr->free_esub_list);
 
     if (!(options & PJMEDIA_EVENT_MGR_NO_THREAD)) {
-        status = pj_sem_create(pool, "ev_sem", 0, MAX_EVENTS + 1, &mgr->sem);
+        status = pj_sem_create(mgr->pool, "ev_sem", 0, MAX_EVENTS + 1,
+                               &mgr->sem);
         if (status != PJ_SUCCESS)
             return status;
 
-        status = pj_thread_create(pool, "ev_thread", &event_worker_thread,
+        status = pj_thread_create(mgr->pool, "ev_thread",
+                                  &event_worker_thread,
                                   mgr, 0, 0, &mgr->thread);
         if (status != PJ_SUCCESS) {
@@ -170 +176 @@
     }
 
-    status = pj_mutex_create_recursive(pool, "ev_mutex", &mgr->mutex);
+    status = pj_mutex_create_recursive(mgr->pool, "ev_mutex", &mgr->mutex);
     if (status != PJ_SUCCESS) {
         pjmedia_event_mgr_destroy(mgr);
@@ -197 +203 @@
 PJ_DEF(void) pjmedia_event_mgr_destroy(pjmedia_event_mgr *mgr)
 {
-    esub *sub;
-
     if (!mgr) mgr = pjmedia_event_mgr_instance();
     PJ_ASSERT_ON_FAIL(mgr != NULL, return);
@@ -218 +222 @@
     }
 
-    sub = mgr->esub_list.next;
-    while (sub != &mgr->esub_list) {
-        esub *next = sub->next;
-        pj_list_erase(sub);
-        sub = next;
-    }
+    if (mgr->pool)
+        pj_pool_release(mgr->pool);
 
     if (event_manager_instance == mgr)
@@ -242 +242 @@
 
 PJ_DEF(pj_status_t) pjmedia_event_subscribe( pjmedia_event_mgr *mgr,
-                                             pj_pool_t *pool,
                                              pjmedia_event_cb *cb,
                                              void *user_data,
@@ -249 +248 @@
     esub *sub;
 
-    PJ_ASSERT_RETURN(pool && cb, PJ_EINVAL);
+    PJ_ASSERT_RETURN(cb, PJ_EINVAL);
 
     if (!mgr) mgr = pjmedia_event_mgr_instance();
@@ -271 +270 @@
     }
 
-    sub = PJ_POOL_ZALLOC_T(pool, esub);
+    if (mgr->free_esub_list.next != &mgr->free_esub_list) {
+        sub = mgr->free_esub_list.next;
+        pj_list_erase(sub);
+    } else
+        sub = PJ_POOL_ZALLOC_T(mgr->pool, esub);
     sub->cb = cb;
     sub->user_data = user_data;
@@ -310 +313 @@
                 mgr->pub_next_sub = sub->next;
             pj_list_erase(sub);
+            pj_list_push_back(&mgr->free_esub_list, sub);
             if (user_data && epub)
                 break;

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -268 +268 @@
 
     /* Subscribe to device's events */
-    pjmedia_event_subscribe(NULL, vp->pool, &vidstream_event_cb,
+    pjmedia_event_subscribe(NULL, &vidstream_event_cb,
                             vp, vp->strm);
 
@@ -411 +411 @@
 
     /* Subscribe to client port's events */
-    pjmedia_event_subscribe(NULL, vp->pool, &client_port_event_cb, vp,
+    pjmedia_event_subscribe(NULL, &client_port_event_cb, vp,
                             vp->client_port);
 

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -1362 +1362 @@
 
     /* Subscribe to codec events */
-    pjmedia_event_subscribe(NULL, pool, &stream_event_cb, stream,
+    pjmedia_event_subscribe(NULL, &stream_event_cb, stream,
                             stream->codec);
 

pjproject/trunk/pjmedia/src/test/vid_codec_test.c

@@ -321 +321 @@
 
         /* Subscribe to codec events */
-        pjmedia_event_subscribe(NULL, pool, &codec_on_event, &codec_port_data,
+        pjmedia_event_subscribe(NULL, &codec_on_event, &codec_port_data,
                                 codec);
     }

pjproject/trunk/pjmedia/src/test/vid_dev_test.c

@@ -161 +161 @@
 
     /* Set event handler */
-    pjmedia_event_subscribe(NULL, pool, &vid_event_cb, NULL, renderer);
+    pjmedia_event_subscribe(NULL, &vid_event_cb, NULL, renderer);
 
     /* Connect capture to renderer */

pjproject/trunk/pjmedia/src/test/vid_port_test.c

@@ -118 +118 @@
 
     /* Set event handler */
-    pjmedia_event_subscribe(NULL, pool, &vid_event_cb, NULL, renderer);
+    pjmedia_event_subscribe(NULL, &vid_event_cb, NULL, renderer);
 
     /* Connect capture to renderer */

pjproject/trunk/pjsip-apps/src/samples/aviplay.c

@@ -402 +402 @@
 
         /* subscribe events */
-        pjmedia_event_subscribe(NULL, pool, &avi_event_cb, &avi_port,
+        pjmedia_event_subscribe(NULL, &avi_event_cb, &avi_port,
                                 renderer);
 

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

@@ -830 +830 @@
 #if ENABLE_EVENT
             /* Register to video events */
-            pjmedia_event_subscribe(NULL, w->pool, &call_media_on_event,
+            pjmedia_event_subscribe(NULL, &call_media_on_event,
                                     call_med, w->vp_rend);
 #endif
@@ -900 +900 @@
             w = &pjsua_var.win[wid];
 #if ENABLE_EVENT
-            pjmedia_event_subscribe(NULL, w->pool, &call_media_on_event,
+            pjmedia_event_subscribe(NULL, &call_media_on_event,
                                     call_med, w->vp_cap);
 #endif
@@ -1909 +1909 @@
 
 #if ENABLE_EVENT
-    pjmedia_event_subscribe(NULL, new_w->pool, &call_media_on_event,
+    pjmedia_event_subscribe(NULL, &call_media_on_event,
                             call_med, new_w->vp_cap);
 #endif
@@ -1951 +1951 @@
 #if ENABLE_EVENT
     /* Resubscribe */
-    pjmedia_event_subscribe(NULL, w->pool, &call_media_on_event,
+    pjmedia_event_subscribe(NULL, &call_media_on_event,
                             call_med, w->vp_cap);
 #endif