Changeset 22406 in vbox

Timestamp:

Aug 24, 2009 9:03:22 AM (15 years ago)

Author:

vboxsync

Message:

NAT: DrvNAT and Slirp use the same macroces for (de-)registering counters

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (5 diffs)
• slirp/counters.h (modified) (4 diffs)
• slirp/slirp.c (modified) (2 diffs)

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

@@ -166 +166 @@
     HANDLE                  hWakeupEvent;
 #endif
-    STAMCOUNTER             StatQueuePktSent;       /**< counting packet sent via PDM queue */
-    STAMCOUNTER             StatQueuePktDropped;    /**< counting packet drops by PDM queue */
-    STAMCOUNTER             StatConsumerFalse;      /**< how often to wait for guest RX buffers */
+    
+#define DRV_PROFILE_COUNTER(name, dsc)     STAMPROFILE Stat ## name
+#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 */
@@ -176 +177 @@
     /** Receive Req queue (deliver packets to the guest) */
     PRTREQQUEUE             pRecvReqQueue;
-    STAMCOUNTER             StatNATRecvWakeups;     /**< how often to wakeup the guest RX thread */
 #endif
 } DRVNAT;
@@ -237 +237 @@
     if (RT_FAILURE(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, RT_INDEFINITE_WAIT)))
     {
-        AssertMsgFailed(("No RX available even on indefinite wait"));
+        AssertMsgFailed(("NAT: No RX available even on indefinite wait"));
     }
     int rc = pThis->pPort->pfnReceive(pThis->pPort, pu8Buf, cb);
@@ -839 +839 @@
     pThis->pNATState = NULL;
 #ifdef VBOX_WITH_STATISTICS
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatQueuePktSent);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatQueuePktDropped);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatConsumerFalse);
+# define DRV_PROFILE_COUNTER(name, dsc)     DEREGISTER_COUNTER(name, pThis)
+# define DRV_COUNTING_COUNTER(name, dsc)    DEREGISTER_COUNTER(name, pThis)
+# include "counters.h"
 #endif
 }
@@ -968 +968 @@
         slirp_register_statistics(pThis->pNATState, pDrvIns);
 #ifdef VBOX_WITH_STATISTICS
-        PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatQueuePktSent,    STAMTYPE_COUNTER,
-                               STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "counting packet sent viai "
-                               "PDM queue", "/Drivers/NAT%u/QueuePacketSent", pDrvIns->iInstance);
-        PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatQueuePktDropped, STAMTYPE_COUNTER,
-                               STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "counting packet sent via PDM"
-                               " queue", "/Drivers/NAT%u/QueuePacketDropped", pDrvIns->iInstance);
-        PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatConsumerFalse, STAMTYPE_COUNTER,
-                               STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "counting PDM consumer false"
-                               " queue", "/Drivers/NAT%u/PDMConsumerFalse", pDrvIns->iInstance);
-# ifdef SLIRP_SPLIT_CAN_OUTPUT
-        PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatNATRecvWakeups, STAMTYPE_COUNTER,
-                               STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "counting wakeups of NATRX"
-                               " thread", "/Drivers/NAT%u/NATRecvWakeups", pDrvIns->iInstance);
-# endif
+# define DRV_PROFILE_COUNTER(name, dsc)     REGISTER_COUNTER(name, pThis, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc)
+# define DRV_COUNTING_COUNTER(name, dsc)    REGISTER_COUNTER(name, pThis, STAMTYPE_COUNTER, STAMUNIT_COUNT,          dsc)
+# include "counters.h" 
 #endif
 

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

@@ -31 +31 @@
 # define COUNTERS_H
 # if defined(VBOX_WITH_STATISTICS) 
-#  define REGISTER_COUNTER(name, type, units, dsc)                  \
+#  define REGISTER_COUNTER(name, storage, type, units, dsc)         \
     do {                                                            \
         PDMDrvHlpSTAMRegisterF(pDrvIns,                             \
-                               &pData->Stat ## name,                \
+                               &(storage)->Stat ## name,            \
                                type,                                \
                                STAMVISIBILITY_ALWAYS,               \
@@ -42 +42 @@
                                pDrvIns->iInstance);                 \
     } while (0)
-#  define DEREGISTER_COUNTER(name) PDMDrvHlpSTAMDeregister(pDrvIns, &pData->Stat ## name)
+#  define DEREGISTER_COUNTER(name, storage) PDMDrvHlpSTAMDeregister(pDrvIns, &(storage)->Stat ## name)
 # else
-#  define REGISTER_COUNTER(name, type, units, dsc) do {} while (0)
-#  define DEREGISTER_COUNTER(name) do {} while (0)
+#  define REGISTER_COUNTER(name, storage, type, units, dsc) do {} while (0)
+#  define DEREGISTER_COUNTER(name, storage) do {} while (0)
 # endif
 # undef COUNTERS_INIT
@@ -61 +61 @@
  * DRV_ prefixed are counters used in DrvNAT the rest are used in Slirp
  */
-# ifdef DRV_PROFILE_COUNTER
-#  define PROFILE_COUNTER(name, dsc) do {} while (0)
-# endif
-# ifdef DRV_COUNTING_COUNTER
-#  define COUNTING_COUNTER(name, dsc) do {} while (0)
-# endif
 
-# ifdef PROFILE_COUNTER
-#  define DRV_PROFILE_COUNTER(name, dsc) do {} while (0)
-# endif
-# ifdef COUNTING_COUNTER
-#  define DRV_COUNTING_COUNTER(name, dsc) do {} while (0)
-# endif
-
+# if defined(PROFILE_COUNTER) || defined(COUNTING_COUNTER)
 PROFILE_COUNTER(Fill, "Profiling slirp fills");
 PROFILE_COUNTER(Poll, "Profiling slirp polls");
@@ -125 +113 @@
 PROFILE_COUNTER(ALIAS_input, "ALIAS::input");
 PROFILE_COUNTER(ALIAS_output, "ALIAS::output");
+
+# else
+/*DrvNAT.cpp*/
+#  ifdef SLIRP_SPLIT_CAN_OUTPUT
+DRV_COUNTING_COUNTER(NATRecvWakeups, "counting wakeups of NAT RX thread");
+#  endif
+DRV_COUNTING_COUNTER(QueuePktSent, "counting packet sent via PDM Queue");       /**< counting packet sent via PDM queue */
+DRV_COUNTING_COUNTER(QueuePktDropped, "counting packet drops by PDM Queue");    /**< counting packet drops by PDM queue */
+DRV_COUNTING_COUNTER(ConsumerFalse, "counting consumer's reject number to process the queue's item");      /**< how often to wait for guest RX buffers */
+# endif
 #endif /*!COUNTERS_INIT*/
 

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

@@ -568 +568 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-# define PROFILE_COUNTER(name, dsc)     REGISTER_COUNTER(name, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc)
-# define COUNTING_COUNTER(name, dsc)    REGISTER_COUNTER(name, STAMTYPE_COUNTER, STAMUNIT_COUNT,          dsc)
+# 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"
@@ -586 +586 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-# define PROFILE_COUNTER(name, dsc)     DEREGISTER_COUNTER(name)
-# define COUNTING_COUNTER(name, dsc)    DEREGISTER_COUNTER(name)
+# define PROFILE_COUNTER(name, dsc)     DEREGISTER_COUNTER(name, pData)
+# define COUNTING_COUNTER(name, dsc)    DEREGISTER_COUNTER(name, pData)
 
 # include "counters.h"