Changeset 22413 in vbox

Timestamp:

Aug 24, 2009 1:53:08 PM (15 years ago)

Author:

vboxsync

Message:

NAT: Backed r51387

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (2 diffs)
• slirp/counters.h (modified) (2 diffs)
• slirp/slirp.c (modified) (3 diffs)
• slirp/slirp_state.h (modified) (2 diffs)

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

@@ -52 +52 @@
 #include <iprt/req.h>
 
-#define COUNTERS_INIT
-#include "counters.h"
 
 /*******************************************************************************
@@ -237 +235 @@
 static DECLCALLBACK(void) drvNATRecvWorker(PDRVNAT pThis, uint8_t *pu8Buf, int cb)
 {
-    STAM_PROFILE_START(&pThis->StatNATRecv, a);
     if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, RT_INDEFINITE_WAIT)))
     {
         AssertMsgFailed(("NAT: No RX available even on indefinite wait"));
     }
-    STAM_PROFILE_STOP(&pThis->StatNATRecvWait, a);
     int rc = pThis->pPort->pfnReceive(pThis->pPort, pu8Buf, cb);
     RTMemFree(pu8Buf);
-    STAM_PROFILE_STOP(&pThis->StatNATRecv, a);
     AssertRC(rc);
 }

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

@@ -47 +47 @@
 #  define DEREGISTER_COUNTER(name, storage) do {} while (0)
 # endif
-#else
 # undef COUNTERS_INIT
 #endif
@@ -119 +118 @@
 #  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");       /**< counting packet sent via PDM queue */

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

@@ +1 @@
+#include "slirp.h"
 #ifdef RT_OS_OS2
 # include <paths.h>
@@ -15 +16 @@
 #endif
 #include <alias.h>
+#define COUNTERS_INIT
+#include "counters.h"
 
 #if !defined(RT_OS_WINDOWS)
@@ -567 +570 @@
 # define PROFILE_COUNTER(name, dsc)     REGISTER_COUNTER(name, pData, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc)
 # define COUNTING_COUNTER(name, dsc)    REGISTER_COUNTER(name, pData, STAMTYPE_COUNTER, STAMUNIT_COUNT,          dsc)
+
 # include "counters.h"
+
 # undef COUNTER
 /** @todo register statistics for the variables dumped by:

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

@@ -23 +23 @@
 
 #include <iprt/req.h>
-
-#define COUNTERS_INIT
-#include "counters.h"
-
 #include "ip_icmp.h"
 #include "dnsproxy/dnsproxy.h"
+
 /** Number of DHCP clients supported by NAT. */
 #define NB_ADDR     16
@@ -251 +248 @@
 #define PROFILE_COUNTER(name, dsc)     STAMPROFILE Stat ## name
 #define COUNTING_COUNTER(name, dsc)    STAMCOUNTER Stat ## name
+
 #include "counters.h"