Changeset 5971 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c

Timestamp:

Apr 23, 2019 8:42:45 AM (5 years ago)

Author:

nanang

Message:

Fixed #2191:

• Stricter double timer entry scheduling prevention.
• Integrate group lock in SIP transport, e.g: for add/dec ref, for timer scheduling.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport.c (modified) (7 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -1013 +1013 @@
     PJ_UNUSED_ARG(timer_heap);
 
+    if (entry->id == PJ_FALSE)
+        return;
+
     entry->id = PJ_FALSE;
     pjsip_transport_destroy(tp);
@@ -1049 +1052 @@
 
     PJ_ASSERT_RETURN(tp != NULL, PJ_EINVAL);
+
+    /* Add ref transport group lock, if any */
+    if (tp->grp_lock)
+        pj_grp_lock_add_ref(tp->grp_lock);
 
     /* Cache some vars for checking transport validity later */
@@ -1064 +1071 @@
         {
             if (tp->idle_timer.id != PJ_FALSE) {
+                tp->idle_timer.id = PJ_FALSE;
                 pjsip_endpt_cancel_timer(tp->tpmgr->endpt, &tp->idle_timer);
-                tp->idle_timer.id = PJ_FALSE;
             }
         }
@@ -1115 +1122 @@
             }
 
-            pj_assert(tp->idle_timer.id == 0);
-            tp->idle_timer.id = PJ_TRUE;
-            pjsip_endpt_schedule_timer(tp->tpmgr->endpt, &tp->idle_timer, 
-                                       &delay);
+            /* Avoid double timer entry scheduling */
+            if (pj_timer_entry_running(&tp->idle_timer))
+                pjsip_endpt_cancel_timer(tp->tpmgr->endpt, &tp->idle_timer);
+
+            pjsip_endpt_schedule_timer_w_grp_lock(tp->tpmgr->endpt,
+                                                  &tp->idle_timer,
+                                                  &delay,
+                                                  PJ_TRUE,
+                                                  tp->grp_lock);
         }
         pj_lock_release(tpmgr->lock);
     }
+
+    /* Dec ref transport group lock, if any */
+    if (tp->grp_lock)
+        pj_grp_lock_dec_ref(tp->grp_lock);
 
     return PJ_SUCCESS;
@@ -1169 +1185 @@
     pj_hash_set(tp->pool, mgr->table, &tp->key, key_len, hval, tp);
 
+    /* Add ref transport group lock, if any */
+    if (tp->grp_lock)
+        pj_grp_lock_add_ref(tp->grp_lock);
+
     pj_lock_release(mgr->lock);
 
@@ -1200 +1220 @@
     //pj_assert(tp->idle_timer.id == PJ_FALSE);
     if (tp->idle_timer.id != PJ_FALSE) {
+        tp->idle_timer.id = PJ_FALSE;
         pjsip_endpt_cancel_timer(mgr->endpt, &tp->idle_timer);
-        tp->idle_timer.id = PJ_FALSE;
     }
 
@@ -1226 +1246 @@
     pj_lock_release(mgr->lock);
     pj_lock_release(tp->lock);
+
+    /* Dec ref transport group lock, if any */
+    if (tp->grp_lock)
+        pj_grp_lock_dec_ref(tp->grp_lock);
 
     /* Destroy. */