Changeset 22206 in vbox for trunk/src/VBox

Timestamp:

Aug 12, 2009 12:41:36 PM (15 years ago)

Author:

vboxsync

Message:

NAT: make experiment more clear

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (6 diffs)
• slirp/if.c (modified) (1 diff)
• slirp/libslirp.h (modified) (1 diff)

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

@@ -64 +64 @@
 #define SLIRP_CAN_SAND_IN_PDM 1
 #define SLIRP_SPLIT_CAN_OUTPUT 1
-#define SLIRP_FLUSH_DEV 1
 #endif
 
@@ -169 +168 @@
     STAMCOUNTER             StatQueuePktSent;       /**< counting packet sent via PDM queue */
     STAMCOUNTER             StatQueuePktDropped;    /**< counting packet drops by PDM queue */
-#ifdef SLIRP_FLUSH_DEV
+#ifdef SLIRP_SPLIT_CAN_OUTPUT
     PPDMTHREAD              pPDMQueueFlusher;
     RTSEMEVENT              semPDMQueueFlusher;
@@ -178 +177 @@
 typedef DRVNAT *PDRVNAT;
 
-#ifdef SLIRP_FLUSH_DEV
+#ifdef SLIRP_SPLIT_CAN_OUTPUT
 static DECLCALLBACK(int) drvNATPDMQueueFlusher(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
  {
@@ -204 +203 @@
 #endif
         } 
-        if (new_flag == 0)
-        {
-            pThis->output_flag = 0;
-            goto flusher_sleeping; /*flushing won't give any results */
-        }
-#if 0
-        pThis->output_flag = 0;
-        PDMQueueFlush(pThis->pSendQueue); 
-        rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
-        pThis->output_flag = RT_SUCCESS(rc) ? 1 : 0;
-#endif
-    flusher_sleeping:
+        pThis->output_flag = new_flag;
         RTSemEventWait(pThis->semPDMQueueFlusher, RT_INDEFINITE_WAIT);
         }
@@ -622 +610 @@
 # else
    PDRVNAT pThis = (PDRVNAT)pvUser;
-   //drvNATPDMQueueFlusherWakeup(pThis->pDrvIns, pThis->pPDMQueueFlusher); 
    return pThis->output_flag;
 # endif
 #else
     return 1;
-#endif
-}
-
-void slirp_flush_dev(void *pvUser)
-{
-#ifdef SLIRP_FLUSH_DEV
-#if 0
-    PDRVNAT pThis = (PDRVNAT)pvUser;
-    drvNATPDMQueueFlusherWakeup(pThis->pDrvIns, pThis->pPDMQueueFlusher); 
-#endif
 #endif
 }
@@ -1055 +1032 @@
             AssertRC(rc);
             pThis->output_flag = 0;
-#ifdef SLIRP_FLUSH_DEV
+#ifdef SLIRP_SPLIT_CAN_OUTPUT
             rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pPDMQueueFlusher, pThis, drvNATPDMQueueFlusher,
                                           drvNATPDMQueueFlusherWakeup, 128 * _1K, RTTHREADTYPE_IO, "NAT-PDMFLUSHER");

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

@@ -228 +228 @@
         if (!if_queued) 
         {
-            slirp_flush_dev(pData->pvUser);
             return;
         }

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -113 +113 @@
  */
 unsigned int slirp_get_timeout_ms(PNATState pData);
-void slirp_flush_dev(void *pvUser);
 
 # ifndef RT_OS_WINDOWS