Changeset 32276 in vbox

Timestamp:

Sep 7, 2010 11:33:52 AM (14 years ago)

Author:

vboxsync

Message:

IPRT/Socket: Add extended select API where the events to wait for can be provided

Location:

trunk

Files:

• include/iprt/socket.h (modified) (1 diff)
• include/iprt/tcp.h (modified) (2 diffs)
• src/VBox/Runtime/r3/socket.cpp (modified) (4 diffs)
• src/VBox/Runtime/r3/tcp.cpp (modified) (1 diff)

trunk/include/iprt/socket.h

@@ -149 +149 @@
 RTDECL(int) RTSocketSelectOne(RTSOCKET hSocket, RTMSINTERVAL cMillies);
 
+/** @name Select events
+ * @{ */
+/** Readable without blocking. */
+#define RTSOCKET_EVT_READ         RT_BIT_32(0)
+/** Writable without blocking. */
+#define RTSOCKET_EVT_WRITE        RT_BIT_32(1)
+/** Error condition, hangup, exception or similar. */
+#define RTSOCKET_EVT_ERROR        RT_BIT_32(2)
+/** Mask of the valid bits. */
+#define RTSOCKET_EVT_VALID_MASK   UINT32_C(0x00000007)
+/** @} */
+
+/**
+ * Socket I/O multiplexing
+ * Checks if the socket is ready for one of the given events.
+ *
+ * @returns iprt status code.
+ * @param   Sock        Socket descriptor.
+ * @param   fEvents     Event mask to wait for.
+ * @param   pfEvents    Where to store the event mask on return.
+ * @param   cMillies    Number of milliseconds to wait for the socket.
+ *                      Use RT_INDEFINITE_WAIT to wait for ever.
+ */
+RTR3DECL(int)  RTSocketSelectOneEx(RTSOCKET Sock, uint32_t fEvents, uint32_t *pfEvents,
+                                   RTMSINTERVAL cMillies);
+
 /**
  * Shuts down one or both directions of communciation.

trunk/include/iprt/tcp.h

@@ -32 +32 @@
 #include <iprt/net.h>
 #include <iprt/sg.h>
+#include <iprt/socket.h>
 
 #ifdef IN_RING0
@@ -234 +235 @@
 RTR3DECL(int)  RTTcpSelectOne(RTSOCKET Sock, RTMSINTERVAL cMillies);
 
+/**
+ * Socket I/O multiplexing
+ * Checks if the socket is ready for one of the given events.
+ *
+ * @returns iprt status code.
+ * @param   Sock        Socket descriptor.
+ * @param   fEvents     Event mask to wait for.
+ *                      Use the RTSOCKET_EVT_* defines.
+ * @param   pfEvents    Where to store the event mask on return.
+ * @param   cMillies    Number of milliseconds to wait for the socket.
+ *                      Use RT_INDEFINITE_WAIT to wait for ever.
+ */
+RTR3DECL(int)  RTTcpSelectOneEx(RTSOCKET Sock, uint32_t fEvents, uint32_t *pfEvents,
+                                RTMSINTERVAL cMillies);
 
 #if 0 /* skipping these for now - RTTcpServer* handles this. */

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

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#define LOG_ENABLED
 #ifdef RT_OS_WINDOWS
 # include <winsock2.h>
@@ -293 +294 @@
  * @param   ppSocket        Where to return the IPRT socket handle.
  * @param   hNative         The native handle.
+
  */
 int rtSocketCreateForNative(RTSOCKETINT **ppSocket, RTSOCKETNATIVE hNative)
@@ -980 +982 @@
 
 
+RTDECL(int) RTSocketSelectOneEx(RTSOCKET hSocket, uint32_t fEvents, uint32_t *pfEvents,
+                                RTMSINTERVAL cMillies)
+{
+    /*
+     * Validate input.
+     */
+    RTSOCKETINT *pThis = hSocket;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+    AssertPtrReturn(pfEvents, VERR_INVALID_PARAMETER);
+    AssertReturn(!(fEvents & ~RTSOCKET_EVT_VALID_MASK), VERR_INVALID_PARAMETER);
+    AssertReturn(RTMemPoolRefCount(pThis) >= (pThis->cUsers ? 2U : 1U), VERR_CALLER_NO_REFERENCE);
+
+    *pfEvents = 0;
+
+    /*
+     * Set up the file descriptor sets and do the select.
+     */
+    fd_set fdsetR;
+    fd_set fdsetW;
+    fd_set fdsetE;
+    FD_ZERO(&fdsetR);
+    FD_ZERO(&fdsetW);
+    FD_ZERO(&fdsetE);
+
+    if (fEvents & RTSOCKET_EVT_READ)
+        FD_SET(pThis->hNative, &fdsetR);
+    if (fEvents & RTSOCKET_EVT_WRITE)
+        FD_SET(pThis->hNative, &fdsetW);
+    if (fEvents & RTSOCKET_EVT_ERROR)
+        FD_SET(pThis->hNative, &fdsetE);
+
+    int rc;
+    if (cMillies == RT_INDEFINITE_WAIT)
+        rc = select(pThis->hNative + 1, &fdsetR, &fdsetW, &fdsetE, NULL);
+    else
+    {
+        struct timeval timeout;
+        timeout.tv_sec = cMillies / 1000;
+        timeout.tv_usec = (cMillies % 1000) * 1000;
+        rc = select(pThis->hNative + 1, &fdsetR, &fdsetW, &fdsetE, &timeout);
+    }
+    if (rc > 0)
+    {
+        if (FD_ISSET(pThis->hNative, &fdsetR))
+            *pfEvents |= RTSOCKET_EVT_READ;
+        if (FD_ISSET(pThis->hNative, &fdsetW))
+            *pfEvents |= RTSOCKET_EVT_WRITE;
+        if (FD_ISSET(pThis->hNative, &fdsetE))
+            *pfEvents |= RTSOCKET_EVT_ERROR;
+
+        rc = VINF_SUCCESS;
+    }
+    else if (rc == 0)
+        rc = VERR_TIMEOUT;
+    else
+        rc = rtSocketError();
+
+    return rc;
+}
+
+
 RTDECL(int) RTSocketShutdown(RTSOCKET hSocket, bool fRead, bool fWrite)
 {
@@ -1434 +1498 @@
     if (RT_FAILURE(rc))
     {
-        /** @todo  */
+        WSAResetEvent(pThis->hEvent);
+        fd_set fdsetR;
+        fd_set fdsetW;
+        FD_ZERO(&fdsetR);
+        FD_ZERO(&fdsetW);
+        FD_SET(pThis->hNative, &fdsetR);
+        FD_SET(pThis->hNative, &fdsetW);
+
+        fd_set fdsetE = fdsetR;
+
+        struct timeval timeout;
+        timeout.tv_sec = 0;
+        timeout.tv_usec = 0;
+        rc = select(pThis->hNative + 1, &fdsetR, &fdsetW, &fdsetE, &timeout);
+        if (rc > 0)
+        {
+            rc = VINF_SUCCESS;
+            if (FD_ISSET(pThis->hNative, &fdsetR))
+                fRetEvents |= RTPOLL_EVT_READ;
+            if (FD_ISSET(pThis->hNative, &fdsetW))
+                fRetEvents |= RTPOLL_EVT_WRITE;
+            if (FD_ISSET(pThis->hNative, &fdsetE))
+                fRetEvents |= RTPOLL_EVT_ERROR;
+        }
     }
 

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

@@ -1003 +1003 @@
 
 
+RTR3DECL(int)  RTTcpSelectOneEx(RTSOCKET Sock, uint32_t fEvents, uint32_t *pfEvents,
+                                RTMSINTERVAL cMillies)
+{
+    return RTSocketSelectOneEx(Sock, fEvents, pfEvents, cMillies);
+}
+
+
 RTR3DECL(int) RTTcpGetLocalAddress(RTSOCKET Sock, PRTNETADDR pAddr)
 {