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

Timestamp:

Nov 3, 2017 6:54:54 AM (7 years ago)

Author:

nanang

Message:

Fix #2055:

• Updated active socket to avoid double ioqueue key unregistration.
• Updated ioqueue to avoid double ioq key unregistration (select & epoll only, winnt & uwp does not seem to be affected).
• Added check for potential 'negative' ioqueue->count.

File:

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

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

@@ -517 +517 @@
     pj_ioqueue_lock_key(key);
 
+    /* Best effort to avoid double key-unregistration */
+    if (IS_CLOSING(key)) {
+        pj_ioqueue_unlock_key(key);
+        return PJ_SUCCESS;
+    }
+
     /* Also lock ioqueue */
     pj_lock_acquire(ioqueue->lock);
 
-    pj_assert(ioqueue->count > 0);
-    --ioqueue->count;
+    /* Avoid "negative" ioqueue count */
+    if (ioqueue->count > 0) {
+        --ioqueue->count;
+    } else {
+        /* If this happens, very likely there is double unregistration
+         * of a key.
+         */
+        pj_assert(!"Bad ioqueue count in key unregistration!");
+        PJ_LOG(1,(THIS_FILE, "Bad ioqueue count in key unregistration!"));
+    }
+
 #if !PJ_IOQUEUE_HAS_SAFE_UNREG
     pj_list_erase(key);
@@ -532 +547 @@
         pj_status_t rc = pj_get_os_error();
         pj_lock_release(ioqueue->lock);
+        pj_ioqueue_unlock_key(key);
         return rc;
     }