Changeset 2127 for pjproject/trunk

Timestamp:

Jul 12, 2008 9:10:25 PM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #529: memory leak on Symbian and possibly handle leaks on all platforms when application quits while transactions have not been terminated

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_endpoint.c (modified) (4 diffs)
• sip_transaction.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -106 +106 @@
 static pj_status_t endpt_on_tx_msg( pjsip_endpoint *endpt,
                                     pjsip_tx_data *tdata );
+static pj_status_t unload_module(pjsip_endpoint *endpt,
+                                 pjsip_module *mod);
 
 /* Defined in sip_parser.c */
@@ -241 +243 @@
     }
 
+    /* Unload module */
+    status = unload_module(endpt, mod);
+
+on_return:
+    pj_rwmutex_unlock_write(endpt->mod_mutex);
+
+    if (status != PJ_SUCCESS) {
+        char errmsg[PJ_ERR_MSG_SIZE];
+
+        pj_strerror(status, errmsg, sizeof(errmsg));
+        PJ_LOG(3,(THIS_FILE, "Module \"%.*s\" can not be unregistered: %s",
+                  (int)mod->name.slen, mod->name.ptr, errmsg));
+    }
+
+    return status;
+}
+
+static pj_status_t unload_module(pjsip_endpoint *endpt,
+                                 pjsip_module *mod)
+{
+    pj_status_t status;
+
     /* Try to unload the module. */
     if (mod->unload) {
         status = (*mod->unload)();
-        if (status != PJ_SUCCESS) goto on_return;
+        if (status != PJ_SUCCESS) 
+            return status;
     }
 
@@ -264 +289 @@
     PJ_LOG(4,(THIS_FILE, "Module \"%.*s\" unregistered", 
               (int)mod->name.slen, mod->name.ptr));
-
-on_return:
-    pj_rwmutex_unlock_write(endpt->mod_mutex);
-
-    if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(3,(THIS_FILE, "Module \"%.*s\" can not be unregistered: %s",
-                  (int)mod->name.slen, mod->name.ptr, errmsg));
-    }
 
     return status;
@@ -553 +567 @@
     PJ_LOG(5, (THIS_FILE, "Destroying endpoing instance.."));
 
-    /* Unregister modules. */
+    /* Phase 1: stop all modules */
     mod = endpt->module_list.prev;
     while (mod != &endpt->module_list) {
         pjsip_module *prev = mod->prev;
-        pjsip_endpt_unregister_module(endpt, mod);
+        if (mod->stop) {
+            (*mod->stop)();
+        }
+        mod = prev;
+    }
+
+    /* Phase 2: unload modules. */
+    mod = endpt->module_list.prev;
+    while (mod != &endpt->module_list) {
+        pjsip_module *prev = mod->prev;
+        unload_module(endpt, mod);
         mod = prev;
     }

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -678 +678 @@
         pj_hash_iterator_t *next = pj_hash_next(mod_tsx_layer.htable, it);
         if (tsx) {
+            pjsip_tsx_terminate(tsx, PJSIP_SC_SERVICE_UNAVAILABLE);
             mod_tsx_layer_unregister_tsx(tsx);
             tsx_destroy(tsx);