Changeset 3988

Timestamp:

Mar 28, 2012 7:32:42 AM (12 years ago)

Author:

nanang

Message:

Re #1466: Moved down the atexit callbacks execution in pjmedia & pjsip endpoints to the very end of endpoint destroy sequence.

Location:

pjproject/branches/1.x

Files:

• pjmedia/include/pjmedia/endpoint.h (modified) (1 diff)
• pjmedia/src/pjmedia/endpoint.c (modified) (2 diffs)
• pjsip/include/pjsip/sip_endpoint.h (modified) (1 diff)
• pjsip/src/pjsip/sip_endpoint.c (modified) (2 diffs)

pjproject/branches/1.x/pjmedia/include/pjmedia/endpoint.h

@@ -213 +213 @@
 /**
  * Register cleanup function to be called by media endpoint when 
- * #pjmedia_endpt_destroy() is called.
+ * #pjmedia_endpt_destroy() is called. Note that application should not
+ * use or access any endpoint resource (such as pool, ioqueue) from within
+ * the callback as such resource may have been released when the callback
+ * function is invoked.
  *
  * @param endpt         The media endpoint.

pjproject/branches/1.x/pjmedia/src/pjmedia/endpoint.c

@@ -220 +220 @@
     }
 
+    /* Destroy internal ioqueue */
+    if (endpt->ioqueue && endpt->own_ioqueue) {
+        pj_ioqueue_destroy(endpt->ioqueue);
+        endpt->ioqueue = NULL;
+    }
+
+    endpt->pf = NULL;
+
+    pjmedia_codec_mgr_destroy(&endpt->codec_mgr);
+    pjmedia_aud_subsys_shutdown();
+
     /* Call all registered exit callbacks */
     ecb = endpt->exit_cb_list.next;
@@ -227 +238 @@
     }
 
-    /* Destroy internal ioqueue */
-    if (endpt->ioqueue && endpt->own_ioqueue) {
-        pj_ioqueue_destroy(endpt->ioqueue);
-        endpt->ioqueue = NULL;
-    }
-
-    endpt->pf = NULL;
-
-    pjmedia_codec_mgr_destroy(&endpt->codec_mgr);
-    pjmedia_aud_subsys_shutdown();
     pj_pool_release (endpt->pool);
 

pjproject/branches/1.x/pjsip/include/pjsip/sip_endpoint.h

@@ -521 +521 @@
 /**
  * Register cleanup function to be called by SIP endpoint when 
- * #pjsip_endpt_destroy() is called.
+ * #pjsip_endpt_destroy() is called.  Note that application should not
+ * use or access any endpoint resource (such as pool, ioqueue, timer heap)
+ * from within the callback as such resource may have been released when
+ * the callback function is invoked.
  *
  * @param endpt         The SIP endpoint.

pjproject/branches/1.x/pjsip/src/pjsip/sip_endpoint.c

@@ -579 +579 @@
     PJ_LOG(5, (THIS_FILE, "Destroying endpoing instance.."));
 
-    /* Call all registered exit callbacks */
-    ecb = endpt->exit_cb_list.next;
-    while (ecb != &endpt->exit_cb_list) {
-        (*ecb->func)(endpt);
-        ecb = ecb->next;
-    }
-
     /* Phase 1: stop all modules */
     mod = endpt->module_list.prev;
@@ -615 +608 @@
     /* Destroy timer heap */
     pj_timer_heap_destroy(endpt->timer_heap);
+
+    /* Call all registered exit callbacks */
+    ecb = endpt->exit_cb_list.next;
+    while (ecb != &endpt->exit_cb_list) {
+        (*ecb->func)(endpt);
+        ecb = ecb->next;
+    }
 
     /* Delete endpoint mutex. */