Changeset 4449

Timestamp:

Mar 22, 2013 3:16:35 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1648: Timer heap new API cancel_if_active() should not assert if given bad entry

File:

• pjproject/trunk/pjlib/src/pj/timer.c (modified) (8 diffs)

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

@@ -46 +46 @@
 #define DEFAULT_MAX_TIMED_OUT_PER_POLL  (64)
 
+enum
+{
+    F_DONT_CALL = 1,
+    F_DONT_ASSERT = 2,
+    F_SET_ID = 4
+};
+
 
 /**
@@ -314 +321 @@
 static int cancel( pj_timer_heap_t *ht, 
                    pj_timer_entry *entry, 
-                   int dont_call)
+                   unsigned flags)
 {
   long timer_node_slot;
@@ -331 +338 @@
   if (entry != ht->heap[timer_node_slot])
     {
-      pj_assert(entry == ht->heap[timer_node_slot]);
+      if ((flags & F_DONT_ASSERT) == 0)
+          pj_assert(entry == ht->heap[timer_node_slot]);
       return 0;
     }
@@ -338 +346 @@
       remove_node( ht, timer_node_slot);
 
-      if (dont_call == 0)
+      if ((flags & F_DONT_CALL) == 0)
         // Call the close hook.
         (*ht->callback)(ht, entry);
@@ -552 +560 @@
 static int cancel_timer(pj_timer_heap_t *ht,
                         pj_timer_entry *entry,
-                        pj_bool_t set_id,
+                        unsigned flags,
                         int id_val)
 {
@@ -560 +568 @@
 
     lock_timer_heap(ht);
-    count = cancel(ht, entry, 1);
-    if (set_id) {
+    count = cancel(ht, entry, flags | F_DONT_CALL);
+    if (flags & F_SET_ID) {
         entry->id = id_val;
     }
@@ -577 +585 @@
                                   pj_timer_entry *entry)
 {
-    return cancel_timer(ht, entry, PJ_FALSE, 0);
+    return cancel_timer(ht, entry, 0, 0);
 }
 
@@ -584 +592 @@
                                            int id_val)
 {
-    return cancel_timer(ht, entry, PJ_TRUE, id_val);
+    return cancel_timer(ht, entry, F_SET_ID | F_DONT_ASSERT, id_val);
 }