Changeset 4281 for pjproject/trunk/pjlib/src/pj/timer.c

Timestamp:

Oct 8, 2012 8:13:12 AM (12 years ago)

Author:

ming

Message:

Fixed #1592: Multithreading issues in PJSIP (fixing pj_timer_heap_poll() and lock order inversion in tcp/tls transport)

File:

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

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

@@ -513 +513 @@
     PJ_ASSERT_RETURN(ht, 0);
 
+    lock_timer_heap(ht);
     if (!ht->cur_size && next_delay) {
         next_delay->sec = next_delay->msec = PJ_MAXINT32;
+        unlock_timer_heap(ht);
         return 0;
     }
@@ -521 +523 @@
     pj_gettickcount(&now);
 
-    lock_timer_heap(ht);
     while ( ht->cur_size && 
             PJ_TIME_VAL_LTE(ht->heap[0]->_timer_value, now) &&