Changeset 107214 in vbox

Timestamp:

Dec 3, 2024 6:30:05 AM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

166218

Message:

NAT: unified platform specific code paths in io thread. bugref:10268

File:

• trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp

@@ -40 +40 @@
 # define inet_aton(x, y) inet_pton(2, x, y)
 # define AF_INET6 23
+# define poll WSAPoll
 #endif
 
@@ -741 +742 @@
          * To prevent concurrent execution of sending/receiving threads
          */
-#ifndef RT_OS_WINDOWS
+
         uint32_t uTimeout = DRVNAT_DEFAULT_TIMEOUT;
         pThis->pNATState->nsock = 1;
@@ -749 +750 @@
 
         int cChangedFDs = poll(pThis->pNATState->polls, pThis->pNATState->nsock, uTimeout /* timeout */);
+#ifdef RT_OS_WINDOWS
+        /* Note: This must be called IMMEDIATELY after poll/WSAPoll. */
+        int error = WSAGetLastError();
+#endif
 
         if (cChangedFDs < 0)
         {
+#ifdef RT_OS_WINDOWS
+            LogRel(("NAT: RTWinPoll returned error=%Rrc (cChangedFDs=%d)\n", error, cChangedFDs));
+            Log4(("NAT: NSOCK = %d\n", pThis->pNATState->nsock));
+#else
             if (errno == EINTR)
             {
@@ -763 +772 @@
                 cPollNegRet = 0;
             }
+#endif
         }
 
-
+        Log4(("%s: poll\n", __FUNCTION__));
         slirp_pollfds_poll(pThis->pNATState->pSlirp, cChangedFDs < 0, drvNAT_GetREventsCb /* SlirpGetREventsCb */, pThis /* opaque */);
+
+#ifdef RT_OS_WINDOWS
+        if (pThis->pNATState->polls[0].revents & (POLLIN))
+#else
         if (pThis->pNATState->polls[0].revents & (POLLRDNORM|POLLPRI|POLLRDBAND))
+#endif
         {
             /* drain the pipe
@@ -778 +793 @@
             size_t cbRead;
             uint64_t cbWakeupNotifs = ASMAtomicReadU64(&pThis->cbWakeupNotifs);
+#ifdef RT_OS_WINDOWS
+            cbRead = recv(pThis->pWakeupSockPair[1], &ch[0], RT_MIN(cbWakeupNotifs, 1024), NULL);
+#else
             RTPipeRead(pThis->hPipeRead, &ch[0], RT_MIN(cbWakeupNotifs, 1024), &cbRead);
+#endif
             ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
         }
+
 
         /* process _all_ outstanding requests but don't wait */
         RTReqQueueProcess(pThis->hSlirpReqQueue, 0);
         drvNAT_CheckTimeout(pThis);
-
-#else /* RT_OS_WINDOWS */
-        uint32_t msTimeout = DRVNAT_DEFAULT_TIMEOUT;
-        pThis->pNATState->nsock = 1;
-        slirp_pollfds_fill(pThis->pNATState->pSlirp, &msTimeout, drvNAT_AddPollCb /* SlirpAddPollCb */, pThis /* opaque */);
-        drvNAT_UpdateTimeout(&msTimeout, pThis);
-
-        int cChangedFDs = WSAPoll(pThis->pNATState->polls, pThis->pNATState->nsock, msTimeout /* timeout */);
-        int error = WSAGetLastError();
-        if (cChangedFDs == SOCKET_ERROR)
-        {
-            LogRel(("NAT: RTWinPoll returned error=%Rrc (cChangedFDs=%d)\n", error, cChangedFDs));
-            Log4(("NAT: NSOCK = %d\n", pThis->pNATState->nsock));
-        }
-
-        if (pThis->pNATState->polls[0].revents & (POLLIN))
-        {
-            /* drain the pipe
-             *
-             * Note! drvNATSend decoupled so we don't know how many times
-             * device's thread sends before we've entered multiplex,
-             * so to avoid false alarm drain pipe here to the very end
-             */
-            char ch[1024];
-            size_t cbRead;
-            uint64_t cbWakeupNotifs = ASMAtomicReadU64(&pThis->cbWakeupNotifs);
-            cbRead = recv(pThis->pWakeupSockPair[1], &ch[0], RT_MIN(cbWakeupNotifs, 1024), NULL);
-            ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
-        }
-
-        if (cChangedFDs == 0)
-        {
-            /* only check for slow/fast timers */
-            slirp_pollfds_poll(pThis->pNATState->pSlirp, false /*select error*/, drvNAT_GetREventsCb /* SlirpGetREventsCb */, pThis /* opaque */);
-            RTReqQueueProcess(pThis->hSlirpReqQueue, 0);
-            continue;
-        }
-        /* poll the sockets in any case */
-        Log2(("%s: poll\n", __FUNCTION__));
-        slirp_pollfds_poll(pThis->pNATState->pSlirp, cChangedFDs < 0 /*select error*/, drvNAT_GetREventsCb /* SlirpGetREventsCb */, pThis /* opaque */);
-
-        /* process _all_ outstanding requests but don't wait */
-        RTReqQueueProcess(pThis->hSlirpReqQueue, 0);
-        drvNAT_CheckTimeout(pThis);
-#endif /* RT_OS_WINDOWS */
     }