Changeset 23141 in vbox

Timestamp:

Sep 18, 2009 3:31:10 PM (15 years ago)

Author:

vboxsync

Message:

NAT: clean non-SLIRP_SPLIT_CAN_OUTPUT code

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (11 diffs)
• slirp/counters.h (modified) (1 diff)

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

@@ -59 +59 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define SLIRP_SPLIT_CAN_OUTPUT 1
-
 #define GET_EXTRADATA(pthis, node, name, rc, type, type_name, var)                                  \
 do {                                                                                                \
@@ -114 +112 @@
         x.s_addr = def;                                 \
 } while (0)
-
-/** Queue depth (!SLIRP_SPLIT_CAN_OUTPUT). */
-#define QUEUE_SIZE 50
-
 
 /*******************************************************************************
@@ -149 +143 @@
     /** Queue for NAT-thread-external events. */
     PRTREQQUEUE             pSlirpReqQueue;
-#ifndef SLIRP_SPLIT_CAN_OUTPUT
-    /* Receive PDM queue (deliver packets to the guest) */
-    PPDMQUEUE               pRecvQueue;
-#endif
 
 #ifdef VBOX_WITH_SLIRP_MT
@@ -174 +164 @@
 #define DRV_COUNTING_COUNTER(name, dsc)    STAMCOUNTER Stat ## name
 #include "counters.h"
-#ifdef SLIRP_SPLIT_CAN_OUTPUT
     /** thread delivering packets for receiving by the guest */
     PPDMTHREAD              pRecvThread;
@@ -181 +170 @@
     /** Receive Req queue (deliver packets to the guest) */
     PRTREQQUEUE             pRecvReqQueue;
-#endif
 } DRVNAT;
 AssertCompileMemberAlignment(DRVNAT, StatNATRecvWakeups, 8);
@@ -211 +199 @@
 
 
-#ifdef SLIRP_SPLIT_CAN_OUTPUT
 
 static DECLCALLBACK(int) drvNATRecv(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
@@ -256 +243 @@
     STAM_PROFILE_STOP(&pThis->StatNATRecv, a);
 }
-
-#endif /* SLIRP_SPLIT_CAN_OUTPUT */
 
 /**
@@ -622 +607 @@
     Log2(("slirp_output: pu8Buf=%p cb=%#x (pThis=%p)\n%.*Rhxd\n", pu8Buf, cb, pThis, cb, pu8Buf));
 
-#ifndef SLIRP_SPLIT_CAN_OUTPUT
-    PDRVNATQUEUITEM pItem = (PDRVNATQUEUITEM)PDMQueueAlloc(pThis->pRecvQueue);
-    if (pItem)
-    {
-        pItem->pu8Buf = pu8Buf;
-        pItem->cb = cb;
-        pItem->mbuf = pvArg;
-        Log2(("pItem:%p %.Rhxd\n", pItem, pItem->pu8Buf));
-        PDMQueueInsert(pThis->pRecvQueue, &pItem->Core);
-        STAM_COUNTER_INC(&pThis->StatQueuePktSent);
-        return;
-    }
-    static unsigned s_cDroppedPackets;
-    if (s_cDroppedPackets < 64)
-        s_cDroppedPackets++;
-    else
-    {
-        LogRel(("NAT: %d messages suppressed about dropping packet (couldn't allocate queue item)\n", s_cDroppedPackets));
-        s_cDroppedPackets = 0;
-    }
-    STAM_COUNTER_INC(&pThis->StatQueuePktDropped);
-    RTMemFree((void *)pu8Buf);
-#else
     PRTREQ pReq = NULL;
 
@@ -663 +625 @@
     drvNATRecvWakeup(pThis->pDrvIns, pThis->pRecvThread);
     STAM_COUNTER_INC(&pThis->StatQueuePktSent);
-#endif
-}
-
-
-#ifndef SLIRP_SPLIT_CAN_OUTPUT
-/**
- * Queue callback for processing a queued item.
- *
- * @returns Success indicator.
- *          If false the item will not be removed and the flushing will stop.
- * @param   pDrvIns         The driver instance.
- * @param   pItemCore       Pointer to the queue item to process.
- */
-static DECLCALLBACK(bool) drvNATQueueConsumer(PPDMDRVINS pDrvIns, PPDMQUEUEITEMCORE pItemCore)
-{
-    int rc;
-    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-    PDRVNATQUEUITEM pItem = (PDRVNATQUEUITEM)pItemCore;
-    PRTREQ pReq = NULL;
-    Log(("drvNATQueueConsumer(pItem:%p, pu8Buf:%p, cb:%d)\n", pItem, pItem->pu8Buf, pItem->cb));
-    Log2(("drvNATQueueConsumer: pu8Buf:\n%.Rhxd\n", pItem->pu8Buf));
-    if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0)))
-    {
-        STAM_COUNTER_INC(&pThis->StatConsumerFalse);
-        return false;
-    }
-    rc = pThis->pPort->pfnReceive(pThis->pPort, pItem->pu8Buf, pItem->cb);
-    RTMemFree((void *)pItem->pu8Buf);
-    return true;
-
-    AssertRelease(pItem->mbuf == NULL);
-    return RT_SUCCESS(rc);
-}
-#endif
+}
 
 
@@ -1004 +933 @@
 
 
-#ifndef SLIRP_SPLIT_CAN_OUTPUT
-            rc = PDMDrvHlpPDMQueueCreate(pDrvIns, sizeof(DRVNATQUEUITEM), QUEUE_SIZE, 0,
-                                         drvNATQueueConsumer, "NAT", &pThis->pRecvQueue);
-            if (RT_FAILURE(rc))
-            {
-                LogRel(("NAT: Can't create send queue\n"));
-                return rc;
-            }
-#else
             rc = RTReqCreateQueue(&pThis->pRecvReqQueue);
             if (RT_FAILURE(rc))
@@ -1023 +943 @@
             AssertReleaseRC(rc);
             rc = RTSemEventCreate(&pThis->EventRecv);
-#endif
 
 #ifndef RT_OS_WINDOWS

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

@@ -117 +117 @@
 # else
 /*DrvNAT.cpp*/
-#  ifdef SLIRP_SPLIT_CAN_OUTPUT
 DRV_COUNTING_COUNTER(NATRecvWakeups, "counting wakeups of NAT RX thread");
 DRV_PROFILE_COUNTER(NATRecv,"Time spent in NATRecv worker");
 DRV_PROFILE_COUNTER(NATRecvWait,"Time spent in NATRecv worker in waiting of free RX buffers");
-#  endif
 DRV_COUNTING_COUNTER(QueuePktSent, "counting packet sent via PDM Queue");
 DRV_COUNTING_COUNTER(QueuePktDropped, "counting packet drops by PDM Queue");