Changeset 22449 in vbox for trunk/src

Timestamp:

Aug 26, 2009 5:37:36 AM (16 years ago)

Author:

vboxsync

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

51453

Message:

NAT: re-counters

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) (1 diff)

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

@@ -52 +52 @@
 #include <iprt/req.h>
 
+#define COUNTERS_INIT
+#include "counters.h"
 
 /*******************************************************************************
@@ -235 +237 @@
 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
@@ -118 +119 @@
 #  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

@@ -16 +16 @@
 #endif
 #include <alias.h>
-#define COUNTERS_INIT
-#include "counters.h"
 
 #if !defined(RT_OS_WINDOWS)
@@ -570 +568 @@
 # 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:
@@ -588 +584 @@
 # define PROFILE_COUNTER(name, dsc)     DEREGISTER_COUNTER(name, pData)
 # define COUNTING_COUNTER(name, dsc)    DEREGISTER_COUNTER(name, pData)
-
 # include "counters.h"
 #endif /* VBOX_WITH_STATISTICS */

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"