Changeset 22403 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Aug 24, 2009 7:12:48 AM (15 years ago)

Author:

vboxsync

Message:

NAT: (de-)register counter macrodifinitions was introduced.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• counters.h (modified) (2 diffs)
• slirp.c (modified) (3 diffs)

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

@@ -24 +24 @@
  */
 
-#if !defined(PROFILE_COUNTER) && !defined(DRV_PROFILE_COUNTER)
-# error (DRV_)PROFILE_COUNTER is not defied
+/*
+ * COUNTERS_INIT is used before using counters.h to declare helping macro 
+ * definitions for (de-)registering counters
+ */
+#ifndef COUNTERS_H
+# define COUNTERS_H
+# if defined(VBOX_WITH_STATISTICS) 
+#  define REGISTER_COUNTER(name, type, units, dsc)                  \
+    do {                                                            \
+        PDMDrvHlpSTAMRegisterF(pDrvIns,                             \
+                               &pData->Stat ## name,                \
+                               type,                                \
+                               STAMVISIBILITY_ALWAYS,               \
+                               units,                               \
+                               dsc,                                 \
+                               "/Drivers/NAT%u/" #name,             \
+                               pDrvIns->iInstance);                 \
+    } while (0)
+#  define DEREGISTER_COUNTER(name) PDMDrvHlpSTAMDeregister(pDrvIns, &pData->Stat ## name)
+# else
+#  define REGISTER_COUNTER(name, type, units, dsc) do {} while (0)
+#  define DEREGISTER_COUNTER(name) do {} while (0)
+# endif
 #endif
-#if !defined(COUNTING_COUNTER) && !defined(DRV_COUNTING_COUNTER)
-# error (DRV_)COUNTING_COUNTER is not defined
-#endif
+
+#ifndef COUNTERS_INIT
+# if !defined(PROFILE_COUNTER) && !defined(DRV_PROFILE_COUNTER)
+#  error (DRV_)PROFILE_COUNTER is not defied
+# endif
+# if !defined(COUNTING_COUNTER) && !defined(DRV_COUNTING_COUNTER)
+#  error (DRV_)COUNTING_COUNTER is not defined
+# endif
 
 /*
  * 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 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
+# 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
 
 PROFILE_COUNTER(Fill, "Profiling slirp fills");
@@ -99 +125 @@
 PROFILE_COUNTER(ALIAS_output, "ALIAS::output");
 
-#undef DRV_COUNTING_COUNTER
-#undef DRV_PROFILE_COUNTER
+# undef DRV_COUNTING_COUNTER
+# undef DRV_PROFILE_COUNTER
 
-#undef COUNTING_COUNTER
-#undef PROFILE_COUNTER
+# undef COUNTING_COUNTER
+# undef PROFILE_COUNTER
+#endif /*!COUNTERS_INIT*/

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)
@@ -566 +568 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-# define COUNTER(name, type, units, dsc)                            \
-    do {                                                            \
-        PDMDrvHlpSTAMRegisterF(pDrvIns,                             \
-                               &pData->Stat ## name,                \
-                               type,                                \
-                               STAMVISIBILITY_ALWAYS,               \
-                               units,                               \
-                               dsc,                                 \
-                               "/Drivers/NAT%u/" #name,             \
-                               pDrvIns->iInstance);                 \
-    } while (0)
-
-# define PROFILE_COUNTER(name, dsc)     COUNTER(name, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc)
-# define COUNTING_COUNTER(name, dsc)    COUNTER(name, STAMTYPE_COUNTER, STAMUNIT_COUNT,          dsc)
+# 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)
 
 # include "counters.h"
@@ -598 +588 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-# define PROFILE_COUNTER(name, dsc)     PDMDrvHlpSTAMDeregister(pDrvIns, &pData->Stat ## name)
-# define COUNTING_COUNTER(name, dsc)    PDMDrvHlpSTAMDeregister(pDrvIns, &pData->Stat ## name)
+# define PROFILE_COUNTER(name, dsc)     DEREGISTER_COUNTER(name)
+# define COUNTING_COUNTER(name, dsc)    DEREGISTER_COUNTER(name)
 
 # include "counters.h"