Changeset 3226 for trunk/src

Timestamp:

Mar 24, 2000, 8:22:51 PM (25 years ago)

Author:

sandervl

Message:

fixes

Location:

trunk/src/wsock32/new

Files:

• asyncapi.cpp (modified) (8 diffs)
• asyncthread.cpp (modified) (3 diffs)

trunk/src/wsock32/new/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.3 2000-03-23 23:07:22 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.4 2000-03-24 19:22:51 sandervl Exp $ */
 
 /*
@@ -34 +34 @@
 
 //******************************************************************************
+//NOTE: Must execute RemoveFromQueue before returning
 //******************************************************************************
 void ASYNCCNV WSAsyncThreadProc(void *pparm)
@@ -75 +76 @@
                         }
                 }
-                else    fail = WSANO_DATA;
+                else    fail = wsaHerrno();
                 break;
         }
@@ -154 +155 @@
                      (WPARAM)pThreadParm->hAsyncTaskHandle, lParam);
    }
+   pThreadParm->fActive = FALSE;
+   RemoveFromQueue(pThreadParm); 
 }
 //******************************************************************************
@@ -404 +407 @@
 #define  nr(i)          ((i != -1) ? 1 : 0)
 #define  ready(i)       ((i != -1) && (sockets[i] != -1))
+//NOTE: Must execute RemoveFromQueue before returning
 //******************************************************************************
 void ASYNCCNV WSAsyncSelectThreadProc(void *pparm)
@@ -451 +455 @@
         }
 
-//        dprintf(("WSAsyncSelectThreadProc %x rds=%d, wrs=%d, oos =%d, pending = %x", pThreadParm->u.asyncselect.s, noread, nowrite, noexcept, lEventsPending));
+////        dprintf(("WSAsyncSelectThreadProc %x rds=%d, wrs=%d, oos =%d, pending = %x", pThreadParm->u.asyncselect.s, noread, nowrite, noexcept, lEventsPending));
 
         ret = select((int *)sockets, nr(noread), nr(nowrite), nr(noexcept), -1);
@@ -496 +500 @@
                                 ret = getsockopt(s, SOL_SOCKET, SO_ERROR,
                                                  (char *) &sockoptval, &sockoptlen);
-                                if(sockoptval == WSAECONNREFUSED) {
+                                //SvL: WSeB returns SOCECONNREFUSED, Warp 4 0x3d
+                                if(sockoptval == SOCECONNREFUSED || sockoptval == (SOCECONNREFUSED - SOCBASEERR)) {
                                         AsyncNotifyEvent(pThreadParm, FD_CONNECT, WSAECONNREFUSED);
                                 }
@@ -553 +558 @@
         }
    }
+   //remove it first, then delete semaphore object
+   pThreadParm->fActive = FALSE;
+   RemoveFromQueue(pThreadParm); 
    delete pThreadParm->u.asyncselect.asyncSem;
+   pThreadParm->u.asyncselect.asyncSem = 0;
 }
 //******************************************************************************

trunk/src/wsock32/new/asyncthread.cpp

@@ -1 @@
-/* $Id: asyncthread.cpp,v 1.2 2000-03-23 19:21:53 sandervl Exp $ */
+/* $Id: asyncthread.cpp,v 1.3 2000-03-24 19:22:51 sandervl Exp $ */
 
 /*
@@ -36 +36 @@
   pThreadParm->asyncProc((PVOID)arg);
 
-//only for blocking hooks (currently not implemented
+//only for blocking hooks (currently not implemented)
 ////  if(pThreadParm->request == ASYNC_BLOCKHOOK)
 ////    WSASetBlocking(FALSE, pThreadParm->hThread);
 
-  pThreadParm->fActive = FALSE;
-  RemoveFromQueue(pThreadParm); 
   free((PVOID)pThreadParm);
 
@@ -216 +214 @@
    if(pThreadInfo) {
         pThreadInfo->u.asyncselect.lEventsPending |= (pThreadInfo->u.asyncselect.lEvents & flags);
+        //unblock async thread if it was waiting
+        pThreadInfo->u.asyncselect.asyncSem->post();
+
         //cancel pending select in async select thread (if any)
         so_cancel(s);
-
-        //unblock async thread if it was waiting
-        pThreadInfo->u.asyncselect.asyncSem->post();
    }
    asyncThreadMutex.leave();