Changeset 22252 in vbox

Timestamp:

Aug 14, 2009 8:31:12 AM (16 years ago)

Author:

vboxsync

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

51066

Message:

NAT: polling + counter wakeup counter in NATRx

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (7 diffs)

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

@@ -172 +172 @@
     RTSEMEVENT              semNATRx;
     bool                    fCanOutput;
+    STAMCOUNTER             StatNATRxWakeups;
 #endif
 } DRVNAT;
@@ -185 +186 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        int rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
-        bool fHaveRxBuffers = RT_SUCCESS(rc);
+        int rc;
+        bool fHaveRxBuffers;
+        do {
+            rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
+            fHaveRxBuffers = RT_SUCCESS(rc);
+            if (!fHaveRxBuffers) RTThreadSleep(2);
+        } while (!fHaveRxBuffers && pThread->enmState == PDMTHREADSTATE_RUNNING);
 
         if (!pThis->fCanOutput && fHaveRxBuffers)
@@ -214 +220 @@
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
     int rc = RTSemEventSignal(pThis->semNATRx);
+    STAM_COUNTER_INC(&pThis->StatNATRxWakeups);
     AssertReleaseRC(rc);
     return VINF_SUCCESS;
@@ -532 +539 @@
 #endif /* RT_OS_WINDOWS */
 #ifdef SLIRP_SPLIT_CAN_OUTPUT
-        drvNATRxWakeup(pThis->pDrvIns, pThis->thrNATRx);
+        if (!pThis->fCanOutput)
+            drvNATRxWakeup(pThis->pDrvIns, pThis->thrNATRx);
 #endif
     }
@@ -596 +604 @@
 {
 #ifdef SLIRP_SPLIT_CAN_OUTPUT
+   PDRVNAT pThis = (PDRVNAT)pvUser;
    return pThis->fCanOutput;
 #else
@@ -662 +671 @@
     if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0)))
     {
+        STAM_COUNTER_INC(&pThis->StatConsumerFalse);
+        return false;
+    }
+#else
+    if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0)))
+    {
+        drvNATRxWakeup(pThis->pDrvIns, pThis->thrNATRx);
         STAM_COUNTER_INC(&pThis->StatConsumerFalse);
         return false;
@@ -971 +987 @@
                               STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "counting PDM consumer false"
                               " queue", "/Drivers/NAT%u/PDMConsumerFalse", pDrvIns->iInstance);
+# ifdef SLIRP_SPLIT_CAN_OUTPUT
+        PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatNATRxWakeups, STAMTYPE_COUNTER,
+                              STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "counting wakeups of NATRX"
+                              " thread", "/Drivers/NAT%u/NATRxWakeups", pDrvIns->iInstance);
+# endif
 #endif