Changeset 1532 for pjproject/branches/pjproject-0.5-stable/pjlib/src/pj/ioqueue_select.c

Timestamp:

Oct 31, 2007 7:58:30 AM (17 years ago)

Author:

bennylp

Message:

Fixed deadlock in increment_counter() and decrement_counter() caused by different lock order (thanks Phil Torre)

File:

• pjproject/branches/pjproject-0.5-stable/pjlib/src/pj/ioqueue_select.c (modified) (2 diffs)

pjproject/branches/pjproject-0.5-stable/pjlib/src/pj/ioqueue_select.c

@@ -409 +409 @@
 static void decrement_counter(pj_ioqueue_key_t *key)
 {
+    pj_lock_acquire(key->ioqueue->lock);
     pj_mutex_lock(key->ioqueue->ref_cnt_mutex);
     --key->ref_count;
@@ -418 +419 @@
         pj_time_val_normalize(&key->free_time);
 
-        pj_lock_acquire(key->ioqueue->lock);
         pj_list_erase(key);
         pj_list_push_back(&key->ioqueue->closing_list, key);
         /* Rescan fdset to get max descriptor */
         rescan_fdset(key->ioqueue);
-        pj_lock_release(key->ioqueue->lock);
     }
     pj_mutex_unlock(key->ioqueue->ref_cnt_mutex);
+    pj_lock_release(key->ioqueue->lock);
 }
 #endif