Changeset 2130 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Jul 13, 2008 12:24:55 PM (16 years ago)

Author:

bennylp

Message:

Ticket #518: some fixes for growing memory usage in PJSUA-LIB, by using temporary pools for temporary variables and by having separate pool for each account and buddy

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (11 diffs)

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

@@ -331 +331 @@
                                           pjsua_call_id *p_call_id)
 {
+    pj_pool_t *tmp_pool;
     pjsip_dialog *dlg = NULL;
     pjmedia_sdp_session *offer;
@@ -383 +384 @@
     call = &pjsua_var.calls[call_id];
 
+    /* Create temporary pool */
+    tmp_pool = pjsua_pool_create("tmpcall10", 512, 256);
+
     /* Verify that destination URI is valid before calling 
      * pjsua_acc_create_uac_contact, or otherwise there  
@@ -389 +393 @@
      */
     if (1) {
-        pj_pool_t *pool;
         pjsip_uri *uri;
         pj_str_t dup;
 
-        pool = pjsua_pool_create("tmp-uri", 4000, 4000);
-        if (!pool) {
-            pjsua_perror(THIS_FILE, "Unable to create pool", PJ_ENOMEM);
-            PJSUA_UNLOCK();
-            return PJ_ENOMEM;
-        }
-        
-        pj_strdup_with_null(pool, &dup, dest_uri);
-        uri = pjsip_parse_uri(pool, dup.ptr, dup.slen, 0);
-        pj_pool_release(pool);
+        pj_strdup_with_null(tmp_pool, &dup, dest_uri);
+        uri = pjsip_parse_uri(tmp_pool, dup.ptr, dup.slen, 0);
 
         if (uri == NULL) {
             pjsua_perror(THIS_FILE, "Unable to make call", 
                          PJSIP_EINVALIDREQURI);
+            pj_pool_release(tmp_pool);
             PJSUA_UNLOCK();
             return PJSIP_EINVALIDREQURI;
@@ -427 +423 @@
         contact = acc->contact;
     } else {
-        status = pjsua_acc_create_uac_contact(pjsua_var.pool, &contact,
+        status = pjsua_acc_create_uac_contact(tmp_pool, &contact,
                                               acc_id, dest_uri);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to generate Contact header", 
                          status);
+            pj_pool_release(tmp_pool);
             PJSUA_UNLOCK();
             return status;
@@ -443 +440 @@
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Dialog creation failed", status);
+        pj_pool_release(tmp_pool);
         PJSUA_UNLOCK();
         return status;
@@ -550 +548 @@
         *p_call_id = call_id;
 
+    pj_pool_release(tmp_pool);
     PJSUA_UNLOCK();
 
@@ -567 +566 @@
     }
 
+    pj_pool_release(tmp_pool);
     PJSUA_UNLOCK();
     return status;
@@ -2618 +2618 @@
 {
     pj_status_t status;
+    pj_pool_t *pool;
     pjmedia_sdp_conn *conn;
     pjmedia_sdp_attr *attr;
@@ -2623 +2624 @@
     pjmedia_sdp_session *sdp;
 
+    /* Use call's pool */
+    pool = call->inv->pool;
+
     /* Get media socket info */
     pjmedia_transport_info_init(&tp_info);
@@ -2628 +2632 @@
 
     /* Create new offer */
-    status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pjsua_var.pool, 1,
+    status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, pool, 1,
                                       &tp_info.sock_info, &sdp);
     if (status != PJ_SUCCESS) {
@@ -2650 +2654 @@
 
     /* Add inactive attribute */
-    attr = pjmedia_sdp_attr_create(pjsua_var.pool, "inactive", NULL);
+    attr = pjmedia_sdp_attr_create(pool, "inactive", NULL);
     pjmedia_sdp_media_add_attr(sdp->media[0], attr);