Changeset 5178

Timestamp:

Sep 11, 2015 9:44:52 AM (9 years ago)

Author:

nanang

Message:

Re #1885: Fixed race condition in evsub scenario 2 (Subscription timer callback vs subscription destroy).

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (5 diffs)

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

@@ -236 +236 @@
     pjsip_transaction    *pending_sub;  /**< Pending UAC SUBSCRIBE tsx.     */
     pj_timer_entry       *pending_sub_timer; /**< Stop pending sub timer.   */
+    pj_grp_lock_t        *grp_lock;     /* Session group lock       */
 
     void                 *mod_data[PJSIP_MAX_MODULE];   /**< Module data.   */
@@ -515 +516 @@
         timeout.sec = seconds;
         timeout.msec = 0;
-        sub->timer.id = timer_id;
-
-        pjsip_endpt_schedule_timer(sub->endpt, &sub->timer, &timeout);
+
+        pj_timer_heap_schedule_w_grp_lock(
+                            pjsip_endpt_get_timer_heap(sub->endpt),
+                            &sub->timer, &timeout, timer_id, sub->grp_lock);
 
         PJ_LOG(5,(sub->obj_name, "Timer %s scheduled in %d seconds", 
                   timer_names[sub->timer.id], timeout.sec));
     }
+}
+
+
+/*
+ * Destructor.
+ */
+static void evsub_on_destroy(void *obj)
+{
+    pjsip_evsub *sub = (pjsip_evsub*)obj;
+
+    /* Decrement dialog's session */
+    pjsip_dlg_dec_session(sub->dlg, &mod_evsub.mod);
 }
 
@@ -557 +571 @@
     }
 
-    /* Decrement dialog's session */
-    pjsip_dlg_dec_session(sub->dlg, &mod_evsub.mod);
+    pj_grp_lock_dec_ref(sub->grp_lock);
 }
 
@@ -849 +862 @@
     pjsip_dlg_inc_session(sub->dlg, &mod_evsub.mod);
 
+    /* Init group lock */
+    status = pj_grp_lock_create(dlg->pool, NULL, &sub->grp_lock);
+    if (status != PJ_SUCCESS) {
+        pjsip_dlg_dec_session(sub->dlg, &mod_evsub.mod);
+        goto on_return;
+    }
+
+    pj_grp_lock_add_ref(sub->grp_lock);
+    pj_grp_lock_add_handler(sub->grp_lock, dlg->pool, sub, &evsub_on_destroy);
+
     /* Done */
     *p_evsub = sub;
@@ -938 +961 @@
         sub->accept = (pjsip_accept_hdr*)pjsip_hdr_clone(sub->pool,accept_hdr);
 
+    /* Increment dlg session. */
+    pjsip_dlg_inc_session(dlg, &mod_evsub.mod);
+
+    /* Init group lock */
+    status = pj_grp_lock_create(dlg->pool, NULL, &sub->grp_lock);
+    if (status != PJ_SUCCESS) {
+        pjsip_dlg_dec_session(sub->dlg, &mod_evsub.mod);
+        goto on_return;
+    }
+
+    pj_grp_lock_add_ref(sub->grp_lock);
+    pj_grp_lock_add_handler(sub->grp_lock, dlg->pool, sub, &evsub_on_destroy);
+
     /* We can start the session: */
 
-    pjsip_dlg_inc_session(dlg, &mod_evsub.mod);
     sub->pending_tsx++;
     tsx->mod_data[mod_evsub.mod.id] = sub;
-
 
     /* Done. */