Changeset 821

Timestamp:

Nov 23, 2006 7:31:27 AM (18 years ago)

Author:

bennylp

Message:

Fixed crash in IoCompletionPort? during unregistration. Also remove WSACleanup() from pj_shutdown() since it may not be a good idea (and for one thing it crashes with Invalid Handle exception)

Location:

pjproject/trunk/pjlib/src/pj

Files:

• ioqueue_winnt.c (modified) (3 diffs)
• os_core_win32.c (modified) (1 diff)

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

@@ -688 +688 @@
     }
 #endif
+
+#if PJ_IOQUEUE_HAS_SAFE_UNREG
+    /* Mark key as closing before closing handle. */
+    key->closing = 1;
+#endif
     
     /* Close handle (the only way to disassociate handle from IOCP). 
@@ -702 +707 @@
 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
-    /* Mark key as closing. */
-    key->closing = 1;
-
-    /* Decrement reference counter. */
-    decrement_counter(key);
-
     /* Even after handle is closed, I suspect that IOCP may still try to
      * do something with the handle, causing memory corruption when pool
@@ -715 +714 @@
      * an ugly solution..
      */
-    pj_thread_sleep(0);
+    while (pj_atomic_get(key->ref_count) != 1)
+        pj_thread_sleep(0);
+
+    /* Decrement reference counter to destroy the key. */
+    decrement_counter(key);
 #endif
 

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

@@ -220 +220 @@
 
     /* Shutdown Winsock */
-    WSACleanup();
+    //WSACleanup();
 }