Changeset 7604 for trunk/src/kernel32/overlappedio.cpp

Timestamp:

Dec 10, 2001, 1:55:13 PM (24 years ago)

Author:

sandervl

Message:

overlapped io updates & fixes

File:

• trunk/src/kernel32/overlappedio.cpp (modified) (7 diffs)

trunk/src/kernel32/overlappedio.cpp

@@ -1 @@
-/* $Id: overlappedio.cpp,v 1.10 2001-12-10 11:29:01 sandervl Exp $ */
+/* $Id: overlappedio.cpp,v 1.11 2001-12-10 12:55:12 sandervl Exp $ */
 
 /*
@@ -55 +55 @@
     dprintf(("OverlappedIOThread: hEventRead %x hEventWrite %x hEventPoll %x", hEventRead, hEventWrite, hEventPoll));
 
-    //the exit event semaphore is manual reset, because this event
+    //the exit & cancel event semaphores are manual reset, because these events
     //must be able to wake up multiple threads
     hEventExit   = ::CreateEventA(NULL, TRUE, FALSE, NULL);
-    if(!hEventPoll || !hEventRead || !hEventWrite || !hEventExit)
+    hEventCancel = ::CreateEventA(NULL, TRUE, FALSE, NULL);
+    if(!hEventPoll || !hEventRead || !hEventWrite || !hEventExit || !hEventCancel)
     {
         DebugInt3();
@@ -254 +255 @@
 
             case ASYNCIO_POLL:
-                hEventsWait[0] = lpRequest->hEventCancel;
+                hEventsWait[0] = hEventCancel;
                 hEventsWait[1] = hEventExit;
                 ret = WAIT_TIMEOUT;
@@ -349 +350 @@
     ::LeaveCriticalSection(&critsect);
 
-    lpOverlapped->Internal     = ERROR_IO_PENDING;
+    lpOverlapped->Internal     = STATUS_PENDING;
     lpOverlapped->InternalHigh = 0;
     lpOverlapped->Offset       = 0;
@@ -407 +408 @@
     ::LeaveCriticalSection(&critsect);
 
-    lpOverlapped->Internal     = ERROR_IO_PENDING;
+    lpOverlapped->Internal     = STATUS_PENDING;
     lpOverlapped->InternalHigh = 0;
     lpOverlapped->Offset       = 0;
@@ -459 +460 @@
     lpRequest->next                = NULL;
 
-    lpOverlapped->Internal     = ERROR_IO_PENDING;
+    lpOverlapped->Internal     = STATUS_PENDING;
     lpOverlapped->InternalHigh = 0;
     lpOverlapped->Offset       = 0;
@@ -509 +510 @@
     for(int i=ASYNC_INDEX_READ;i<NR_ASYNC_OPERATIONS;i++)
     {
-        while(TRUE) {
+        while(TRUE) 
+        {
             lpRequest = findAndRemoveRequest(i, hHandle);
 
             if(lpRequest) {
-                 ::SetEvent(lpRequest->hEventCancel);   //cancel pending operation
+                 //TODO: This doesn't work if multiple handles share the
+                 //      same OverlappedIOHandler
+                 lpRequest->fCancelled = TRUE;
+                 ::SetEvent(hEventCancel);   //cancel pending operation
                  if(i != ASYNC_INDEX_BUSY) {//thread that handles the request will delete it
                     delete lpRequest;