Changeset 958 for pjproject

Timestamp:

Feb 17, 2007 12:30:24 AM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #107: deadlock with ioqueue/IOCP unregistration when unregistration is done in the callback

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_winnt.c (modified) (3 diffs)

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

@@ -667 +667 @@
 PJ_DEF(pj_status_t) pj_ioqueue_unregister( pj_ioqueue_key_t *key )
 {
+    unsigned i;
+    enum { RETRY = 10 };
+
     PJ_ASSERT_RETURN(key, PJ_EINVAL);
 
@@ -714 +717 @@
      * an ugly solution..
      */
-    while (pj_atomic_get(key->ref_count) != 1)
+    //This will loop forever if unregistration is done on the callback.
+    //Doing this with RETRY I think should solve the IOCP setting the 
+    //socket signalled, without causing the deadlock.
+    //while (pj_atomic_get(key->ref_count) != 1)
+    //  pj_thread_sleep(0);
+    for (i=0; pj_atomic_get(key->ref_count) != 1 && i<RETRY; ++i)
         pj_thread_sleep(0);
 
@@ -755 +763 @@
     /* Check the closing keys only when there's no activity and when there are
      * pending closing keys.
-     */
-    if (event_count == 0 && !pj_list_empty(&ioqueue->closing_list)) {
+     * blp:
+     *  no, always check the list. Otherwise on busy activity, this will cause
+     *  ioqueue to reject new registration.
+     */
+    if (/*event_count == 0 &&*/ !pj_list_empty(&ioqueue->closing_list)) {
         pj_time_val now;
         pj_ioqueue_key_t *key;