Changeset 28146 in vbox

Timestamp:

Apr 9, 2010 2:20:16 PM (15 years ago)

Author:

vboxsync

Message:

NAT: Use poll/WSAWaitForMultipleEvents timeouts instead of timers.

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvNAT.cpp (modified) (10 diffs)
• Devices/Network/slirp/slirp.c (modified) (1 diff)
• NetworkServices/NAT/VBoxNetNAT.cpp (modified) (11 diffs)

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

@@ -675 +675 @@
     int     ms;
 #ifdef RT_OS_WINDOWS
-    DWORD   event;
-    HANDLE  *phEvents;
+    HANDLE  *phEvents = slirp_get_events(pThis->pNATState);
     unsigned int cBreak = 0;
 #else /* RT_OS_WINDOWS */
-    struct pollfd *polls = NULL;
     unsigned int cPollNegRet = 0;
 #endif /* !RT_OS_WINDOWS */
@@ -687 +685 @@
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
         return VINF_SUCCESS;
-
-#ifdef RT_OS_WINDOWS
-    phEvents = slirp_get_events(pThis->pNATState);
-#endif /* RT_OS_WINDOWS */
 
     /*
@@ -697 +691 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        nFDs = -1;
         /*
          * To prevent concurent execution of sending/receving threads
@@ -703 +696 @@
 #ifndef RT_OS_WINDOWS
         nFDs = slirp_get_nsock(pThis->pNATState);
-        polls = NULL;
         /* allocation for all sockets + Management pipe */
-        polls = (struct pollfd *)RTMemAlloc((1 + nFDs) * sizeof(struct pollfd) + sizeof(uint32_t));
+        struct pollfd *polls = (struct pollfd *)RTMemAlloc((1 + nFDs) * sizeof(struct pollfd) + sizeof(uint32_t));
         if (polls == NULL)
             return VERR_NO_MEMORY;
@@ -711 +703 @@
         /* don't pass the managemant pipe */
         slirp_select_fill(pThis->pNATState, &nFDs, &polls[1]);
-#if 0
-        ms = slirp_get_timeout_ms(pThis->pNATState);
-#else
-        ms = 0;
-#endif
 
         polls[0].fd = pThis->PipeRead;
@@ -722 +709 @@
         polls[0].revents = 0;
 
-        int cChangedFDs = poll(polls, nFDs + 1, ms ? ms : -1);
+        int cChangedFDs = poll(polls, nFDs + 1, slirp_get_timeout_ms(pThis->pNATState));
         if (cChangedFDs < 0)
         {
@@ -765 +752 @@
         RTReqProcess(pThis->pSlirpReqQueue, 0);
         RTMemFree(polls);
+
 #else /* RT_OS_WINDOWS */
+        nFDs = -1;
         slirp_select_fill(pThis->pNATState, &nFDs);
-#if 0
-        ms = slirp_get_timeout_ms(pThis->pNATState);
-#else
-        ms = 0;
-#endif
-        struct timeval tv = { 0, ms*1000 };
-        event = WSAWaitForMultipleEvents(nFDs, phEvents, FALSE, ms ? ms : WSA_INFINITE, FALSE);
-        if (   (event < WSA_WAIT_EVENT_0 || event > WSA_WAIT_EVENT_0 + nFDs - 1)
-            && event != WSA_WAIT_TIMEOUT)
+        DWORD dwEvent = WSAWaitForMultipleEvents(nFDs, phEvents, FALSE,
+                                                 slirp_get_timeout_ms(pThis->pNATState),
+                                                 FALSE);
+        if (   (dwEvent < WSA_WAIT_EVENT_0 || dwEvent > WSA_WAIT_EVENT_0 + nFDs - 1)
+            && dwEvent != WSA_WAIT_TIMEOUT)
         {
             int error = WSAGetLastError();
-            LogRel(("NAT: WSAWaitForMultipleEvents returned %d (error %d)\n", event, error));
+            LogRel(("NAT: WSAWaitForMultipleEvents returned %d (error %d)\n", dwEvent, error));
             RTAssertPanic();
         }
 
-        if (event == WSA_WAIT_TIMEOUT)
+        if (dwEvent == WSA_WAIT_TIMEOUT)
         {
             /* only check for slow/fast timers */
@@ -790 +775 @@
         /* poll the sockets in any case */
         Log2(("%s: poll\n", __FUNCTION__));
-        slirp_select_poll(pThis->pNATState, /* fTimeout=*/false, /* fIcmp=*/(event == WSA_WAIT_EVENT_0));
+        slirp_select_poll(pThis->pNATState, /* fTimeout=*/false, /* fIcmp=*/(dwEvent == WSA_WAIT_EVENT_0));
         /* process _all_ outstanding requests but don't wait */
         RTReqProcess(pThis->pSlirpReqQueue, 0);
@@ -863 +848 @@
 void slirp_arm_fast_timer(void *pvUser)
 {
+#if 0
     PDRVNAT pThis = (PDRVNAT)pvUser;
     AssertPtr(pThis);
     TMTimerSetMillies(pThis->pTmrFast, 2);
+#endif
 }
 
@@ -883 +870 @@
 void slirp_arm_slow_timer(void *pvUser)
 {
+#if 0
     PDRVNAT pThis = (PDRVNAT)pvUser;
     AssertPtr(pThis);
+
     TMTimerSetMillies(pThis->pTmrSlow, 500);
+#endif
 }
 

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -1851 +1851 @@
             return 500; /* see PR_SLOWHZ */
     }
-    return 0;
+    return 3600*1000;   /* one hour */
 }
 

trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp

@@ -51 +51 @@
 #include <VBox/intnet.h>
 #include <VBox/intnetinline.h>
+#include <VBox/pdmnetinline.h>
 #include <VBox/vmm.h>
 #include <VBox/version.h>
@@ -303 +304 @@
                     }
 
+                    uint8_t abHdrScratch[256];
                     uint32_t const cSegs = PDMNetGsoCalcSegmentCount(pGso, cbFrame - sizeof(*pGso));
                     for (uint32_t iSeg = 0; iSeg < cSegs; iSeg++)
@@ -308 +310 @@
                         uint32_t cbSegFrame;
                         void  *pvSegFrame = PDMNetGsoCarveSegmentQD(pGso, (uint8_t *)(pGso + 1), cbFrame, abHdrScratch,
-                                                                    &cbSegFrame);
+                                                                    iSeg, cSegs, &cbSegFrame);
                         m = slirp_ext_m_get(g_pNAT->m_pNATState, cbFrame, &pvSlirpFrame, &cbIgnored);
                         if (!m)
@@ -318 +320 @@
 
                         rc = RTReqCallEx(m_pReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                                         (PFNRT)SendWorker, 2, m, cbSubFrame);
+                                         (PFNRT)SendWorker, 2, m, cbSegFrame);
                         AssertReleaseRC(rc);
                     }
@@ -463 +465 @@
     VBoxNetNAT *pThis = (VBoxNetNAT *)pvUser;
     int     nFDs = -1;
-    unsigned int ms;
 #ifdef RT_OS_WINDOWS
-    DWORD   event;
-    HANDLE  *phEvents;
-    unsigned int cBreak = 0;
+    HANDLE *pahEvents = slirp_get_events(pThis->m_pNATState);
 #else /* RT_OS_WINDOWS */
-    struct pollfd *polls = NULL;
     unsigned int cPollNegRet = 0;
 #endif /* !RT_OS_WINDOWS */
 
     LogFlow(("drvNATAsyncIoThread: pThis=%p\n", pThis));
-
-
-#ifdef RT_OS_WINDOWS
-    phEvents = slirp_get_events(pThis->m_pNATState);
-#endif /* RT_OS_WINDOWS */
 
     /*
@@ -485 +478 @@
     for(;;)
     {
-        nFDs = -1;
-
         /*
          * To prevent concurent execution of sending/receving threads
@@ -492 +483 @@
 #ifndef RT_OS_WINDOWS
         nFDs = slirp_get_nsock(pThis->m_pNATState);
-        polls = NULL;
         /* allocation for all sockets + Management pipe */
-        polls = (struct pollfd *)RTMemAlloc((1 + nFDs) * sizeof(struct pollfd) + sizeof(uint32_t));
+        struct pollfd *polls = (struct pollfd *)RTMemAlloc((1 + nFDs) * sizeof(struct pollfd) + sizeof(uint32_t));
         if (polls == NULL)
             return VERR_NO_MEMORY;
@@ -500 +490 @@
         /* don't pass the managemant pipe */
         slirp_select_fill(pThis->m_pNATState, &nFDs, &polls[1]);
-        ms = slirp_get_timeout_ms(pThis->m_pNATState);
+        unsigned int cMsTimeout = slirp_get_timeout_ms(pThis->m_pNATState);
 
         polls[0].fd = pThis->m_PipeRead;
@@ -507 +497 @@
         polls[0].revents = 0;
 
-        int cChangedFDs = poll(polls, nFDs + 1, -1);
+        int cChangedFDs = poll(polls, nFDs + 1, cMsTimeout);
         if (cChangedFDs < 0)
         {
@@ -548 +538 @@
         RTReqProcess(pThis->m_pReqQueue, 0);
         RTMemFree(polls);
+
 #else /* RT_OS_WINDOWS */
+        nFDs = -1;
         slirp_select_fill(pThis->m_pNATState, &nFDs);
-        event = WSAWaitForMultipleEvents(nFDs, phEvents, FALSE, WSA_INFINITE, FALSE);
-        if (   (event < WSA_WAIT_EVENT_0 || event > WSA_WAIT_EVENT_0 + nFDs - 1)
-            && event != WSA_WAIT_TIMEOUT)
+        DWORD dwEvent = WSAWaitForMultipleEvents(nFDs, pahEvents, FALSE,
+                                                 slirp_get_timeout_ms(pThis->m_pNATState),
+                                                 FALSE);
+        if (   (dwEvent < WSA_WAIT_EVENT_0 || dwEvent > WSA_WAIT_EVENT_0 + nFDs - 1)
+            && dwEvent != WSA_WAIT_TIMEOUT)
         {
             int error = WSAGetLastError();
-            LogRel(("NAT: WSAWaitForMultipleEvents returned %d (error %d)\n", event, error));
+            LogRel(("NAT: WSAWaitForMultipleEvents returned %d (error %d)\n", dwEvent, error));
             RTAssertReleasePanic();
         }
 
-        if (event == WSA_WAIT_TIMEOUT)
+        if (dwEvent == WSA_WAIT_TIMEOUT)
         {
             /* only check for slow/fast timers */
@@ -567 +561 @@
 
         /* poll the sockets in any case */
-        slirp_select_poll(pThis->m_pNATState, /* fTimeout=*/false, /* fIcmp=*/(event == WSA_WAIT_EVENT_0));
+        slirp_select_poll(pThis->m_pNATState, /* fTimeout=*/false, /* fIcmp=*/(dwEvent == WSA_WAIT_EVENT_0));
         /* process _all_ outstanding requests but don't wait */
         RTReqProcess(pThis->m_pReqQueue, 0);