Changeset 22193 in vbox

Timestamp:

Aug 12, 2009 7:23:29 AM (16 years ago)

Author:

vboxsync

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

50979

Message:

NAT: Moving splitting slirp_output to experimental (disabled) code and restoration of old behaviour

File:

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

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

@@ -62 +62 @@
 #define VBOX_NAT_DELAY_HACK
 #if 0
+#define SLIRP_SPLIT_CAN_OUTPUT 1
 #define SLIRP_CAN_SAND_IN_PDM 1
 #define SLIRP_FLUSH_DEV 1
@@ -168 +169 @@
     STAMCOUNTER             StatQueuePktSent;       /**< counting packet sent via PDM queue */
     STAMCOUNTER             StatQueuePktDropped;    /**< counting packet drops by PDM queue */
+#ifdef SLIRP_FLUSH_DEV
+    PPDMTHREAD              pPDMQueueFlusher;
+    RTSEMEVENT              semPDMQueueFlusher;
+#endif
+    int     output_flag;
 } DRVNAT;
 /** Pointer the NAT driver instance data. */
@@ -533 +539 @@
 
 #endif /* VBOX_WITH_SLIRP_MT */
+#ifdef SLIRP_FLUSH_DEV
+static DECLCALLBACK(int) drvNATPDMQueueFlusher(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
+    if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
+        return VINF_SUCCESS;
+    while (pThread->enmState == PDMTHREADSTATE_RUNNING)
+        {
+        pThis->output_flag = 0;
+        PDMQueueFlush(pThis->pSendQueue);
+        pThis->output_flag = 1;
+        RTSemEventWait(pThis->semPDMQueueFlusher, RT_INDEFINITE_WAIT);
+        }
+    return VINF_SUCCESS;
+}
+
+
+static DECLCALLBACK(int) drvNATPDMQueueFlusherWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
+
+    return VINF_SUCCESS;
+}
+#endif
 
 /**
@@ -541 +571 @@
 int slirp_can_output(void *pvUser)
 {
-#ifdef SLIRP_CAN_SAND_IN_PDM
+#ifdef SLIRP_SPLIT_CAN_OUTPUT
+# ifdef SLIRP_CAN_SAND_IN_PDM
     int status = 0;
     int rc = 0;
@@ -554 +585 @@
         rc = RTSemEventWait(pThis->semStatus, RT_INDEFINITE_WAIT); 
         AssertRC(rc);
-        return status;
+        return status & pThis->output_flag;
     }
     return 0;
+# else
+   PDRVNAT pThis = (PDRVNAT)pvUser;
+   return (RT_SUCCESS(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0))? 1 : 0) & pThis->output_flag;
+# endif
 #else
-   PDRVNAT pThis = (PDRVNAT)pvUser;
-   return (RT_SUCCESS(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0))? 1 : 0);
+    return 1;
 #endif
 }
@@ -567 +601 @@
 #ifdef SLIRP_FLUSH_DEV
     PDRVNAT pThis = (PDRVNAT)pvUser;
-    /*@todo: idealy should be done in other thread */
-    PDMQueueFlush(pThis->pSendQueue);
+    RTSemEventSignal(pThis->semPDMQueueFlusher);
 #endif
 }
@@ -632 +665 @@
     switch (pItem->enmType) {
         case SLIRP_SEND:
+#ifndef SLIRP_SPLIT_CAN_OUTPUT
+            if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0)))
+                return false;
+#endif
             rc = pThis->pPort->pfnReceive(pThis->pPort, pItem->pu8Buf, pItem->cb);
             RTMemFree((void *)pItem->pu8Buf);
@@ -982 +1019 @@
             rc = RTSemEventCreate(&pThis->semStatus);
             AssertRC(rc);
+            pThis->output_flag = 1;
+#ifdef SLIRP_FLUSH_DEV
+            rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pPDMQueueFlusher, pThis, drvNATPDMQueueFlusher,
+                                          drvNATPDMQueueFlusherWakeup, 128 * _1K, RTTHREADTYPE_IO, "NAT-PDMFLUSHER");
+            AssertReleaseRC(rc);
+            rc = RTSemEventCreate(&pThis->semPDMQueueFlusher);
+#endif
 
 #ifndef RT_OS_WINDOWS