Changeset 20350 in vbox

Timestamp:

Jun 6, 2009 8:25:47 AM (16 years ago)

Author:

vboxsync

Message:

NAT: make counters registration easier

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• counters.h (added)
• slirp.c (modified) (3 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -711 +711 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatFill, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
-                           STAMUNIT_TICKS_PER_CALL, "Profiling slirp fills", "/Drivers/NAT%d/Fill", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatPoll, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
-                           STAMUNIT_TICKS_PER_CALL, "Profiling slirp polls", "/Drivers/NAT%d/Poll", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatFastTimer, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
-                           STAMUNIT_TICKS_PER_CALL, "Profiling slirp fast timer", "/Drivers/NAT%d/TimerFast", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatSlowTimer, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
-                           STAMUNIT_TICKS_PER_CALL, "Profiling slirp slow timer", "/Drivers/NAT%d/TimerSlow", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatTCP, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
-                           STAMUNIT_COUNT, "TCP sockets", "/Drivers/NAT%d/SockTCP", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatTCPHot, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
-                           STAMUNIT_COUNT, "TCP sockets active", "/Drivers/NAT%d/SockTCPHot", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatUDP, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
-                           STAMUNIT_COUNT, "UDP sockets", "/Drivers/NAT%d/SockUDP", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatUDPHot, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
-                           STAMUNIT_COUNT, "UDP sockets active", "/Drivers/NAT%d/SockUDPHot", pDrvIns->iInstance);
+# define COUNTER(name, type, units, dsc)                            \
+do{                                                                 \
+    PDMDrvHlpSTAMRegisterF(pDrvIns,                                 \
+                    &pData->Stat ## name,                           \
+                    type,                                           \
+                    STAMVISIBILITY_ALWAYS,                          \
+                    units,                                          \
+                    dsc,                                            \
+                    "/Drivers/NAT%d/Stat" #name, pDrvIns->iInstance);   \
+}while(0)
+
+# define PROFILE_COUNTER(name, dsc) \
+    COUNTER(name, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc) 
+# define COUNTING_COUTER(name, dsc) \
+    COUNTER(name, STAMTYPE_COUNTER, STAMUNIT_COUNT, dsc) 
+
+#include "counters.h"
+
+#undef COUNTER
+#undef PROFILE_COUNTER
+#undef COUNTING_COUTER
+
 #endif /* VBOX_WITH_STATISTICS */
 }
@@ -1161 +1167 @@
             ret = soread(pData, so);
             /* Output it if we read something */
-            if (ret > 0)
+            if (RT_LIKELY(ret > 0))
                 TCP_OUTPUT(pData, sototcpcb(so));
         }
@@ -1753 +1759 @@
     {
         if (time_fasttimo)
-            return 2;
+            return 2; 
         if (do_slowtimo)
             return 500; /* see PR_SLOWHZ */

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

@@ -230 +230 @@
     struct libalias *proxy_alias;
 #endif
-    STAMPROFILE StatFill;
-    STAMPROFILE StatPoll;
-    STAMPROFILE StatFastTimer;
-    STAMPROFILE StatSlowTimer;
-    STAMCOUNTER StatTCP;
-    STAMCOUNTER StatUDP;
-    STAMCOUNTER StatTCPHot;
-    STAMCOUNTER StatUDPHot;
+
+#ifdef VBOX_WITH_STATISTICS
+# define PROFILE_COUNTER(name, dsc) STAMPROFILE Stat ## name
+# define COUNTING_COUTER(name, dsc) STAMCOUNTER Stat ## name
+
+
+#include "counters.h"
+
+
+#undef PROFILE_COUNTER
+#undef COUNTING_COUTER
+#endif
+
 } NATState;