Changeset 3557 for trunk/src/wsock32

Timestamp:

May 19, 2000, 12:54:21 AM (25 years ago)

Author:

sandervl

Message:

don't always call so_cancel

Location:

trunk/src/wsock32

Files:

• asyncapi.cpp (modified) (2 diffs)
• asyncthread.cpp (modified) (3 diffs)
• asyncthread.h (modified) (2 diffs)

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.7 2000-05-02 13:09:43 bird Exp $ */
+/* $Id: asyncapi.cpp,v 1.8 2000-05-18 22:54:20 sandervl Exp $ */
 
 /*
@@ -462 +462 @@
 ////        dprintf(("WSAsyncSelectThreadProc %x rds=%d, wrs=%d, oos =%d, pending = %x", pThreadParm->u.asyncselect.s, noread, nowrite, noexcept, lEventsPending));
 
+        pThreadParm->fWaitSelect = TRUE;
         ret = select((int *)sockets, nr(noread), nr(nowrite), nr(noexcept), -1);
+        pThreadParm->fWaitSelect = FALSE;
         if(ret == SOCKET_ERROR) {
                 int selecterr = sock_errno();

trunk/src/wsock32/asyncthread.cpp

@@ -1 @@
-/* $Id: asyncthread.cpp,v 1.5 2000-05-18 09:09:03 sandervl Exp $ */
+/* $Id: asyncthread.cpp,v 1.6 2000-05-18 22:54:21 sandervl Exp $ */
 
 /*
@@ -200 +200 @@
                 pThreadInfo->fRemoved = TRUE;
         }
-        //cancel pending select in async select thread (if any)
-        so_cancel(s);
+        if(pThreadInfo->fWaitSelect) {
+                //cancel pending select in async select thread (if any)
+                so_cancel(s);
+        }
 
         //unblock async thread if it was waiting
@@ -223 +225 @@
 
         //cancel pending select in async select thread (if any)
-        so_cancel(s);
+        if(pThreadInfo->fWaitSelect) {
+                so_cancel(s);
+        }
    }
    asyncThreadMutex.leave();

trunk/src/wsock32/asyncthread.h

@@ -1 @@
-/* $Id: asyncthread.h,v 1.4 2000-05-18 09:09:04 sandervl Exp $ */
+/* $Id: asyncthread.h,v 1.5 2000-05-18 22:54:21 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
         BOOL            fCancelled;
         BOOL            fConnected;
+        BOOL            fWaitSelect;
         BOOL            fRemoved;  //async select
         AsyncRequestType request;