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

Timestamp:

Jun 19, 2009 11:43:01 AM (16 years ago)

Author:

vboxsync

Message:

DrvNAT,slirp: Even simpler.

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (8 diffs)
• slirp/counters.h (modified) (1 diff)
• slirp/slirp.c (modified) (4 diffs)
• slirp/statistics.h (deleted)

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

@@ -36 +36 @@
 #include <iprt/cidr.h>
 #include <iprt/stream.h>
-
-#include "slirp/statistics.h"
 
 #include "Builtins.h"
@@ -115 +113 @@
     HANDLE                  hWakeupEvent;
 #endif
+    STAMCOUNTER             StatQueuePktSent;       /**< counting packet sent via PDM queue */
+    STAMCOUNTER             StatQueuePktDropped;    /**< counting packet drops by PDM queue */
 } DRVNAT;
 /** Pointer the NAT driver instance data. */
@@ -497 +497 @@
     Log2(("slirp_output: pu8Buf=%p cb=%#x (pThis=%p)\n%.*Rhxd\n", pu8Buf, cb, pThis, cb, pu8Buf));
 
-    STAM_COUNTER_RESET(DRVNAT_STAT(pThis, DrvNAT_package_drop, STAMCOUNTER));
-    STAM_COUNTER_RESET(DRVNAT_STAT(pThis, DrvNAT_package_sent, STAMCOUNTER));
+    STAM_COUNTER_RESET(&pThis->StatQueuePktDropped);
+    STAM_COUNTER_RESET(&pThis->StatQueuePktSent);
     Assert(pThis);
 
@@ -509 +509 @@
         Log2(("pItem:%p %.Rhxd\n", pItem, pItem->pu8Buf));
         PDMQueueInsert(pThis->pSendQueue, &pItem->Core);
-        STAM_COUNTER_INC(DRVNAT_STAT(pThis, DrvNAT_package_sent, STAMCOUNTER));
+        STAM_COUNTER_INC(&pThis->StatQueuePktSent);
         return;
     }
@@ -517 +517 @@
     else
     {
-        LogRel(("NAT: %d messages suppressed about dropping package (couldn't allocate queue item)\n", s_cDroppedPackets));
+        LogRel(("NAT: %d messages suppressed about dropping packet (couldn't allocate queue item)\n", s_cDroppedPackets));
         s_cDroppedPackets = 0;
     }
-    STAM_COUNTER_INC(DRVNAT_STAT(pThis, DrvNAT_package_drop, STAMCOUNTER));
+    STAM_COUNTER_INC(&pThis->StatQueuePktDropped);
     RTMemFree((void *)pu8Buf);
 }
@@ -603 +603 @@
     slirp_deregister_statistics(pThis->pNATState, pDrvIns);
     pThis->pNATState = NULL;
+#ifdef VBOX_WITH_STATISTICS
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatQueuePktSent);
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatQueuePktDropped);
+#endif
 }
 
@@ -833 +837 @@
 #endif
 #define SLIRP_SET_TUNING_VALUE(name, setter)            \
-    do                                                  \
-    {                                                   \
-        int len = 0;                                    \
-        rc = CFGMR3QueryS32(pCfgHandle, name, &len);    \
-        if (RT_SUCCESS(rc))                             \
-            setter(pThis->pNATState, len);              \
-    }while(0)
+            do                                                  \
+            {                                                   \
+                int len = 0;                                    \
+                rc = CFGMR3QueryS32(pCfgHandle, name, &len);    \
+                if (RT_SUCCESS(rc))                             \
+                    setter(pThis->pNATState, len);              \
+            } while(0)
+
         SLIRP_SET_TUNING_VALUE("SocketRcvBuf", slirp_set_rcvbuf);
         SLIRP_SET_TUNING_VALUE("SocketSndBuf", slirp_set_sndbuf);
@@ -846 +851 @@
 
         slirp_register_statistics(pThis->pNATState, pDrvIns);
+#ifdef VBOX_WITH_STATISTICS
+        PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatQueuePktSent,    STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "counting packet sent via 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);
+#endif
+
         int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfgHandle, Network);
         if (RT_SUCCESS(rc2))

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

@@ -75 +75 @@
 PROFILE_COUNTER(TCP_input, "TCP::input");
 
-COUNTING_COUNTER(DrvNAT_package_sent, "counting package sent via PDM queue");
-COUNTING_COUNTER(DrvNAT_package_drop, "counting package drops by PDM queue");
-

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

@@ -20 +20 @@
 #ifdef VBOX_WITH_SLIRP_ALIAS
 # include <alias.h>
-#endif
-
-#ifdef VBOX_WITH_STATISTICS
-# include "statistics.h"
 #endif
 
@@ -715 +711 @@
 }
 
-/* instantiate the variables. */
-#ifdef VBOX_WITH_STATISTICS
-# define COUNTING_COUNTER(name, desc)    DECLHIDDEN(uint32_t) g_offSlirpStat##name
-# define PROFILE_COUNTER(name, desc)     DECLHIDDEN(uint32_t) g_offSlirpStat##name
-# include "counters.h"
-# undef COUNTING_COUNTER
-# undef PROFILE_COUNTER
-#endif
-
 /**
  * Register statistics.
@@ -732 +719 @@
 # define COUNTER(name, type, units, dsc)                            \
     do {                                                            \
-        ASMAtomicUoWriteU32(&g_offSlirpStat##name,                  \
-                            RT_UOFFSETOF(NATState, Stat##name));    \
         PDMDrvHlpSTAMRegisterF(pDrvIns,                             \
                                &pData->Stat ## name,                \
@@ -740 +725 @@
                                units,                               \
                                dsc,                                 \
-                               "/Drivers/NAT%u/Stat" #name,         \
+                               "/Drivers/NAT%u/" #name,             \
                                pDrvIns->iInstance);                 \
     } while (0)