Changeset 2300 for pjproject/trunk/pjlib/src/pj/ioqueue_epoll.c

Timestamp:

Sep 19, 2008 10:18:50 PM (16 years ago)

Author:

bennylp

Message:

Couple of fixes in ioqueue_epoll for ticket #622 (still not working)

File:

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

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

@@ -254 +254 @@
     pj_list_init(&ioqueue->free_list);
     pj_list_init(&ioqueue->closing_list);
+    pj_list_init(&ioqueue->active_list);
 
 
@@ -492 +493 @@
 
     ioqueue = key->ioqueue;
+
+    /* Lock the key to make sure no callback is simultaneously modifying
+     * the key. We need to lock the key before ioqueue here to prevent
+     * deadlock.
+     */
+    pj_mutex_lock(key->mutex);
+
+    /* Also lock ioqueue */
     pj_lock_acquire(ioqueue->lock);