Changeset 1373 for trunk/src/wsock32/async.cpp

Timestamp:

Oct 20, 1999, 12:11:00 PM (26 years ago)

Author:

phaller

Message:

Fix: WSA async rewrite

File:

• trunk/src/wsock32/async.cpp (modified) (5 diffs)

trunk/src/wsock32/async.cpp

@@ -1 @@
-/* $Id: async.cpp,v 1.2 1999-10-20 10:03:52 phaller Exp $ */
+/* $Id: async.cpp,v 1.3 1999-10-20 10:09:49 phaller Exp $ */
 
 /*
@@ -129 +129 @@
 
     void          pushRequest    (PASYNCREQUEST pRequest); // put request on queue
-    BOOL          deleteRequest  (PASYNCREQUEST pRequest); // remove particular request
+    BOOL          cancelAsyncRequest   (PASYNCREQUEST pRequest);
 
     // the thread procedure
@@ -148 +148 @@
     int           dispatchRequest(PASYNCREQUEST pRequest); // complete request
     PASYNCREQUEST popRequest     (void);                   // get one request from queue
+    BOOL          deleteRequest  (PASYNCREQUEST pRequest); // remove particular request
 
     void          lockQueue      (void);                   // enter mutex
@@ -487 +488 @@
  *****************************************************************************/
 
+BOOL WSAAsyncWorker::cancelAsyncRequest(PASYNCREQUEST pRequest)
+{
+  PASYNCREQUEST pRequestTemp;
+  BOOL          rc = TRUE;
+
+  lockQueue();
+
+  // verify pRequest
+  // find request (optional, just for verification)
+  for (pRequestTemp = pRequestHead;
+       pRequestTemp != NULL;
+       pRequestTemp = pRequestTemp->pNext)
+    if (pRequestTemp == pRequest)
+      break;
+
+  // is request in queue ?
+  if (pRequestTemp == pRequest)
+  {
+    // is it busy?
+    if (pRequest->ulState != RS_BUSY)
+    {
+      // if not: set RS_CANCELLED
+      pRequest->ulState = RS_CANCELLED;
+    }
+    else
+    {
+      // if busy: ???
+      dprintf(("WSOCK32:Async: WSAAsyncWorker::cancelAsyncRequest(%08xh, %08xh) how to cancel?\n",
+               this,
+               pRequest));
+      rc = FALSE;
+    }
+  }
+  else
+    rc = FALSE;
+
+  unlockQueue();
+  return rc;
+}
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
 PASYNCREQUEST WSAAsyncWorker::createRequest  (ULONG ulType,
                                               HWND  hwnd,
@@ -1167 +1221 @@
 
   // remove request from queue
-  rc = wsaWorker->deleteRequest(pRequest);
+  rc = wsaWorker->cancelAsyncRequest(pRequest);
   if (rc == TRUE)
     return 0; // success