Changeset 4567

Timestamp:

Jul 19, 2013 6:31:28 AM (11 years ago)

Author:

bennylp

Message:

Closed #1690: Assertion in timer in SIP transaction: Timer being rescheduled when already running

Location:

pjproject/trunk

Files:

• pjlib/include/pj/timer.h (modified) (1 diff)
• pjlib/src/pj/timer.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transaction.c (modified) (4 diffs)

pjproject/trunk/pjlib/include/pj/timer.h

@@ -212 +212 @@
                                               void *user_data,
                                               pj_timer_heap_callback *cb );
+
+/**
+ * Queries whether a timer entry is currently running.
+ *
+ * @param entry     The timer entry to query.
+ *
+ * @return          PJ_TRUE if the timer is running.  PJ_FALSE if not.
+ */
+PJ_DECL(pj_bool_t) pj_timer_entry_running( pj_timer_entry *entry );
 
 /**

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

@@ -467 +467 @@
 }
 
+PJ_DEF(pj_bool_t) pj_timer_entry_running( pj_timer_entry *entry )
+{
+    return (entry->_timer_id >= 1);
+}
+
 #if PJ_TIMER_DEBUG
 static pj_status_t schedule_w_grp_lock_dbg(pj_timer_heap_t *ht,

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -2225 +2225 @@
     pj_status_t status;
 
+    if (resched && pj_timer_entry_running(&tsx->retransmit_timer)) {
+        /* We've been asked to reschedule but the timer is already rerunning.
+         * This can only happen in a race condition where, between removing
+         * this retransmit timer from the heap and actually scheduling it,
+         * another thread has got in and rescheduled the timer itself.  In
+         * this scenario, the transmission has already happened and so we
+         * should just quit out immediately, without either resending the
+         * message or restarting the timer.
+         */
+        return PJ_SUCCESS;
+    }
+
     PJ_ASSERT_RETURN(tsx->last_tx!=NULL, PJ_EBUG);
 
@@ -2333 +2345 @@
          */
         lock_timer(tsx);
+        tsx_cancel_timer( tsx, &tsx->timeout_timer );
         tsx_schedule_timer( tsx, &tsx->timeout_timer, &timeout_timer_val,
                             TIMEOUT_TIMER);
@@ -2678 +2691 @@
 
                 lock_timer(tsx);
+                tsx_cancel_timer(tsx, &tsx->timeout_timer);
                 tsx_schedule_timer( tsx, &tsx->timeout_timer,
                                     &timeout, TIMEOUT_TIMER);
@@ -2706 +2720 @@
              */
             lock_timer(tsx);
+            tsx_cancel_timer(tsx, &tsx->timeout_timer);
             if (tsx->method.id == PJSIP_INVITE_METHOD) {
                 /* Start timer H for INVITE */