Changeset 27510 in vbox for trunk/src/VBox

Timestamp:

Mar 19, 2010 1:37:08 AM (15 years ago)

Author:

vboxsync

Message:

poll-win.cpp,socket.cpp: Tested socket polling for windows.

Location:

trunk/src/VBox/Runtime/r3

Files:

• socket.cpp (modified) (5 diffs)
• win/poll-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -156 +156 @@
 #endif
 } RTSOCKADDRUNION;
-
-
-/*******************************************************************************
-*   Internal Functions                                                         *
-*******************************************************************************/
 
 
@@ -909 +904 @@
 
 /**
+ * Undos the harm done by WSAEventSelect.
+ *
+ * @returns IPRT status code.
+ * @param   pThis               The socket handle.
+ */
+static int rtSocketPollClearEventAndMakeBlocking(RTSOCKETINT *pThis)
+{
+    int rc = VINF_SUCCESS;
+    if (pThis->fSubscribedEvts)
+    {
+        if (WSAEventSelect(pThis->hNative, WSA_INVALID_EVENT, 0) == 0)
+        {
+            pThis->fSubscribedEvts = 0;
+
+            u_long fNonBlocking = 0;
+            int rc2 = ioctlsocket(pThis->hNative, FIONBIO, &fNonBlocking);
+            if (rc2 != 0)
+            {
+                rc = rtSocketError();
+                AssertMsgFailed(("%Rrc; rc2=%d\n", rc, rc2));
+            }
+        }
+        else
+        {
+            rc = rtSocketError();
+            AssertMsgFailed(("%Rrc\n", rc));
+        }
+    }
+    return rc;
+}
+
+
+/**
  * Updates the mask of events we're subscribing to.
  *
@@ -927 +955 @@
     {
         pThis->fSubscribedEvts = fEvents;
-
-        u_long fNonBlocking = 0;
-        if (ioctlsocket(pThis->hNative, FIONBIO, &fNonBlocking))
-            AssertMsgFailed(("%Rrc\n", rtSocketError()));
-
         return VINF_SUCCESS;
     }
@@ -1052 +1075 @@
     {
         if (pThis->cUsers == 1)
+        {
+            rtSocketPollClearEventAndMakeBlocking(pThis);
             pThis->hPollSet = NIL_RTPOLLSET;
+        }
         ASMAtomicDecU32(&pThis->cUsers);
     }
@@ -1087 +1113 @@
     pThis->fPollEvts = 0;
 
-    /* unlock the socket. */
+    /* Make the socket blocking again and unlock the handle. */
     if (pThis->cUsers == 1)
+    {
+        rtSocketPollClearEventAndMakeBlocking(pThis);
         pThis->hPollSet = NIL_RTPOLLSET;
+    }
     ASMAtomicDecU32(&pThis->cUsers);
     return fRetEvents;

trunk/src/VBox/Runtime/r3/win/poll-win.cpp

@@ -197 +197 @@
     if (    dwRc >= WAIT_OBJECT_0
         &&  dwRc <  WAIT_OBJECT_0 + cHandles)
-        rc = VINF_SUCCESS;
+        rc = VERR_INTERRUPTED;
     else if (dwRc == WAIT_TIMEOUT)
         rc = VERR_TIMEOUT;