Changeset 7140 for trunk/src

Timestamp:

Oct 19, 2001, 8:34:47 PM (24 years ago)

Author:

achimha

Message:

implemented async select event error code notification for semaphore notifications

Location:

trunk/src/wsock32

Files:

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

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.16 2001-10-13 18:51:07 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.17 2001-10-19 18:34:47 achimha Exp $ */
 
 /*
@@ -403 +403 @@
     pThreadParm->u.asyncselect.lEventsPending &= ~event;
 
-    event = WSAMAKESELECTREPLY(event, socket_error);
+    // @@@AH 20011019 this changes the event code. Don' think we can do this
+    // for the semaphore notification...
+    ULONG eventReply = WSAMAKESELECTREPLY(event, socket_error);
 
     if (pThreadParm->u.asyncselect.mode == WSA_SELECT_HWND)
     {
-        dprintf(("AsyncSelectNotifyEvent: notifying window, socket: 0x%x, window handle: 0x%x, window message: 0x%x, event: 0x%x", pThreadParm->u.asyncselect.s, pThreadParm->notifyHandle, pThreadParm->notifyData, event));
+        dprintf(("AsyncSelectNotifyEvent: notifying window, socket: 0x%x, window handle: 0x%x, window message: 0x%x, event: 0x%x", pThreadParm->u.asyncselect.s, pThreadParm->notifyHandle, pThreadParm->notifyData, eventReply));
         PostMessageA((HWND)pThreadParm->notifyHandle, (DWORD)pThreadParm->notifyData, (WPARAM)pThreadParm->u.asyncselect.s,
-                     (LPARAM)event);
+                     (LPARAM)eventReply);
     }
     else
@@ -415 +417 @@
     {
         dprintf(("AsyncSelectNotifyEvent: notifying event semaphore, socket: 0x%x, HEVENT: 0x%x, event: 0x%x", pThreadParm->u.asyncselect.s, pThreadParm->notifyHandle, event));
+        // set the event bit in the mask
         pThreadParm->u.asyncselect.lLastEvent |= event;
+        // set the error code for the right value
+        // for this, we first have to find out which bit field to write to
+        char slot = 0;
+        ULONG eventValue = event;
+        while (eventValue > 0)
+        {
+            slot++;
+            eventValue = eventValue >> 1;
+        }
+        pThreadParm->u.asyncselect.iErrorCode[slot] = socket_error;
+        // now post the semaphore so that the client can check the event
         SetEvent(pThreadParm->notifyHandle);
     }
@@ -495 +509 @@
                 case SOCECONNRESET:
                 case SOCEPIPE:
-                        if(lEventsPending & FD_CLOSE) {
+                        if(lEventsPending & FD_CLOSE)
+                        {
                                 dprintf(("FD_CLOSE; broken connection"));
-                                AsyncSelectNotifyEvent(pThreadParm, FD_CLOSE, WSAECONNRESET);
+                                AsyncSelectNotifyEvent(pThreadParm, FD_CLOSE, WSAECONNRESET);
                         }
 
@@ -701 +716 @@
    pThreadParm->u.asyncselect.lEvents        = lEventMask;
    pThreadParm->u.asyncselect.lEventsPending = lEventMask;
+   pThreadParm->u.asyncselect.s              = s;
+   // reset all event bits
    pThreadParm->u.asyncselect.lLastEvent     = 0;
-   pThreadParm->u.asyncselect.s              = s;
+   // reset all error bits
+   memset(&pThreadParm->u.asyncselect.iErrorCode, 0, sizeof(int) * FD_MAX_EVENTS);
    pThreadParm->u.asyncselect.asyncSem       = new VSemaphore;
    if(pThreadParm->u.asyncselect.asyncSem == NULL) {
@@ -731 +749 @@
    if (pThreadInfo)
    {
-        // TODO return correct errors!!!
-        for (int i = 0; i < FD_MAX_EVENTS; i++)
-        {
-           lpEvent->iErrorCode[i] = 0;
-        }
+        // return our internal error bit representation
+        memcpy(&lpEvent->iErrorCode, &pThreadInfo->u.asyncselect.iErrorCode, sizeof(int) * FD_MAX_EVENTS);
+        // return our internal event bit representation
         lpEvent->lNetworkEvents = InterlockedExchange((LPLONG)&pThreadInfo->u.asyncselect.lLastEvent, 0);
    } 

trunk/src/wsock32/asyncthread.h

@@ -1 @@
-/* $Id: asyncthread.h,v 1.9 2001-10-19 18:05:25 achimha Exp $ */
+/* $Id: asyncthread.h,v 1.10 2001-10-19 18:34:47 achimha Exp $ */
 
 /*
@@ -71 +71 @@
                         DWORD       lEvents;
                         DWORD       lEventsPending;
-                        DWORD       lLastEvent;
                         SOCKET      s;
                         int         mode;
-                        // error codes for all events
-                        int         iErrorCode[FD_MAX_EVENTS];
+                        // event bits to signal which event has occured
+                        DWORD       lLastEvent;
+                        // error codes for all events
+                        int         iErrorCode[FD_MAX_EVENTS];
                 } asyncselect;
         } u;