Changeset 4530 for pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

Timestamp:

May 30, 2013 9:27:49 AM (11 years ago)

Author:

nanang

Message:

Fixed #1671:

• Transport manager maintains transmit buffer instance list, so any dangling transmit buffer will be freed when transport manager is destroyed. This is configurable via PJSIP_HAS_TX_DATA_LIST, the default is zero/disabled.
• Updated publish client subscription to not use the 'internal' pjsip_tx_data list structure.

File:

• pjproject/trunk/pjsip/src/pjsip-simple/publishc.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -62 +62 @@
 typedef struct pending_publish
 {
-    PJ_DECL_LIST_MEMBER(pjsip_tx_data);
+    PJ_DECL_LIST_MEMBER(struct pending_publish);
+    pjsip_tx_data               *tdata;
 } pending_publish;
 
@@ -109 +110 @@
     /* Pending PUBLISH request */
     pending_publish              pending_reqs;
+    pending_publish              pending_reqs_empty;
 };
 
@@ -181 +183 @@
     pj_memcpy(&pubc->opt, opt, sizeof(*opt));
     pj_list_init(&pubc->pending_reqs);
+    pj_list_init(&pubc->pending_reqs_empty);
 
     status = pj_mutex_create_recursive(pubc->pool, "pubc%p", &pubc->mutex);
@@ -684 +687 @@
         pj_mutex_lock(pubc->mutex);
         while (!pj_list_empty(&pubc->pending_reqs)) {
-            pjsip_tx_data *tdata = pubc->pending_reqs.next;
-            pj_list_erase(tdata);
+            pending_publish *pp = pubc->pending_reqs.next;
+            pjsip_tx_data *tdata = pp->tdata;
+
+            /* Remove the request from pending request list,
+             * and keep the unused entry into pending_reqs_empty pool.
+             */
+            pj_list_erase(pp);
+            pj_list_push_back(&pubc->pending_reqs_empty, pp);
 
             /* Add SIP-If-Match if we have etag and the request doesn't have
@@ -713 +722 @@
             if (status == PJ_EPENDING) {
                 pj_assert(!"Not expected");
-                pj_list_erase(tdata);
                 pjsip_tx_data_dec_ref(tdata);
             } else if (status == PJ_SUCCESS) {
@@ -745 +753 @@
     if (pubc->pending_tsx) {
         if (pubc->opt.queue_request) {
-            pj_list_push_back(&pubc->pending_reqs, tdata);
+            pending_publish *pp = NULL;
+            if (pj_list_empty(&pubc->pending_reqs_empty)) {
+                pp = PJ_POOL_ZALLOC_T(pubc->pool, pending_publish);
+            } else {
+                pp = pubc->pending_reqs_empty.next;
+                pj_list_erase(pp);
+            }
+            pp->tdata = tdata;
+            pj_list_push_back(&pubc->pending_reqs, pp);
             pj_mutex_unlock(pubc->mutex);
             PJ_LOG(4,(THIS_FILE, "Request is queued, pubc has another "