Changeset 7604 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

overlapped io updates & fixes

Location:

trunk/src/kernel32

Files:

• hmcomm.cpp (modified) (5 diffs)
• overlappedio.cpp (modified) (7 diffs)
• overlappedio.h (modified) (4 diffs)

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.32 2001-12-09 21:19:28 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.33 2001-12-10 12:55:12 sandervl Exp $ */
 
 /*
@@ -238 +238 @@
             comnr = comname[3] - '1';
 
-            if(handler[comnr] == NULL) {
+            if(handler[comnr] == NULL) 
+            {
                 try {
                     handler[comnr] = new OverlappedIOHandler(CommReadIOHandler, CommWriteIOHandler, CommPollIOHandler);
@@ -272 +273 @@
  * Author    : SvL
  *****************************************************************************/
-
 DWORD HMDeviceCommClass::GetFileType(PHMHANDLEDATA pHMHandleData)
 {
@@ -421 +421 @@
         dwEvent |= (COMEvt&0x0080)? EV_ERR:0;
         dwEvent |= (COMEvt&0x0100)? EV_RING:0;
+ 
+        if((dwEvent & EV_RXCHAR) && (dwMask & EV_RXCHAR)) 
+        {
+            //check if there's really data in the in queue
+            RXQUEUE qInfo;
+            ULONG ulLen = sizeof(qInfo);
+            ULONG rc = OSLibDosDevIOCtl(pHMHandleData->hHMHandle,
+                                        IOCTL_ASYNC,
+                                        ASYNC_GETINQUECOUNT,
+                                        0,0,0,
+                                        &qInfo,ulLen,&ulLen);
+            if(qInfo.cch == 0) {
+                dprintf(("!WARNING!: CommPollIOHandler -> EV_RXCHAR but no DATA"));
+                dwEvent &= ~EV_RXCHAR;
+            }
+        }
         if((dwEvent & dwMask)) {
             dprintf(("CommPollIOHandler: event(s) %x occured", (dwEvent & dwMask)));
@@ -726 +742 @@
   PHMDEVCOMDATA pDevData = (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
 
-    dprintf(("KERNEL32-WARNING: HMDeviceCommClass::GetOverlappedResult(%08xh,%08xh,%08xh,%08xh)",
+    dprintf(("KERNEL32-HMDeviceCommClass: HMDeviceCommClass::GetOverlappedResult(%08xh,%08xh,%08xh,%08xh)",
              pHMHandleData->hHMHandle, lpOverlapped, lpcbTransfer, fWait));
 

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;

trunk/src/kernel32/overlappedio.h

@@ -1 @@
-/* $Id: overlappedio.h,v 1.7 2001-12-09 21:55:17 sandervl Exp $ */
+/* $Id: overlappedio.h,v 1.8 2001-12-10 12:55:13 sandervl Exp $ */
 
 /*
@@ -39 +39 @@
     {
         memset(this, 0, sizeof(ASYNCIOREQUEST));
-        hEventCancel = ::CreateEventA(NULL, TRUE, FALSE, NULL);
-        if(hEventCancel == 0) DebugInt3();
-    };
-
-    ~ASYNCIOREQUEST()
-    {
-        ::CloseHandle(hEventCancel);
     };
 
@@ -59 +52 @@
     DWORD               dwEventMask;
     DWORD               dwUserData;
-    HANDLE              hEventCancel;
+    BOOL                fCancelled;
     ASYNCIOREQUEST     *next;
 };
@@ -124 +117 @@
      HANDLE       hThreadWrite;
      HANDLE       hEventExit;
+     HANDLE       hEventCancel;
      HANDLE       hEventPoll;
      HANDLE       hEventRead;