Changeset 5971 for pjproject/trunk/pjlib/src/pj/timer.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/pjlib/src/pj/timer.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/timer.c

@@ -503 +503 @@
 
     /* Prevent same entry from being scheduled more than once */
-    PJ_ASSERT_RETURN(entry->_timer_id < 1, PJ_EINVALIDOP);
+    //PJ_ASSERT_RETURN(entry->_timer_id < 1, PJ_EINVALIDOP);
 
 #if PJ_TIMER_DEBUG
@@ -513 +513 @@
     
     lock_timer_heap(ht);
+
+    /* Prevent same entry from being scheduled more than once */
+    if (pj_timer_entry_running(entry)) {
+        unlock_timer_heap(ht);
+        PJ_LOG(3,(THIS_FILE, "Bug! Rescheduling outstanding entry (%p)",
+                  entry));
+        return PJ_EINVALIDOP;
+    }
+
     status = schedule_entry(ht, entry, &expires);
     if (status == PJ_SUCCESS) {