Changeset 20454 in vbox

Timestamp:

Jun 10, 2009 3:59:34 AM (15 years ago)

Author:

vboxsync

Message:

NAT: several counters in DrvNAT +interface for unify NAT counter's managment

Location:

trunk/src/VBox/Devices/Network

Files:

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

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

@@ -54 +54 @@
  */
 #define VBOX_NAT_DELAY_HACK
-
-
+#ifdef VBOX_WITH_STATISTICS
+# define COUNTING_COUTER(name, dsc) \
+extern "C" void slirp_counting_counter_##name##_reset(PNATState pData); \
+extern "C" void slirp_counting_counter_##name##_inc(PNATState pData); \
+extern "C" void slirp_counting_counter_##name##_add(PNATState pData, int val);
+/* @todo think abaout it */
+# define PROFILE_COUNTER(name, dsc) 
+# include "Network/slirp/counters.h"
+# undef COUNTING_COUTER
+# undef PROFILE_COUNTER
+# define DRVNAT_COUNTER_RESET(pData, name) \
+    slirp_counting_counter_##name##_reset(pData)
+# define DRVNAT_COUNTER_INC(pData, name) \
+    slirp_counting_counter_##name##_inc(pData)
+# define DRVNAT_COUNTER_ADD(pData, name, val) \
+    slirp_counting_counter_##name##_add(pData, (val)) 
+#else
+#define DRVNAT_COUNTER_RESET(name) do{}while(0)
+#define DRVNAT_COUNTER_INC(name) do{}while(0)
+#define DRVNAT_COUNTER_ADD(name) do{}while(0)
+#endif
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -475 +494 @@
     Log2(("slirp_output: pu8Buf=%p cb=%#x (pThis=%p)\n%.*Rhxd\n", pu8Buf, cb, pThis, cb, pu8Buf));
 
+    DRVNAT_COUNTER_RESET(pThis->pNATState, DrvNAT_package_drop);
+    DRVNAT_COUNTER_RESET(pThis->pNATState, DrvNAT_package_sent);
     Assert(pThis);
 
@@ -485 +506 @@
         Log2(("pItem:%p %.Rhxd\n", pItem, pItem->pu8Buf));
         PDMQueueInsert(pThis->pSendQueue, &pItem->Core);
+        DRVNAT_COUNTER_INC(pThis->pNATState, DrvNAT_package_sent);
         return;
     }
@@ -497 +519 @@
         cDroppedPackets = 0;
     }
+    DRVNAT_COUNTER_INC(pThis->pNATState, DrvNAT_package_drop);
     RTMemFree((void *)pu8Buf);
 }

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

@@ -69 +69 @@
 PROFILE_COUNTER(TCP_reassamble, "TCP::reasamble");
 PROFILE_COUNTER(TCP_input, "TCP::input");
+
+COUNTING_COUTER(DrvNAT_package_sent, "counting package sent via PDM queue");
+COUNTING_COUTER(DrvNAT_package_drop, "counting package drops by PDM queue");

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

@@ -1888 +1888 @@
     tcp_sndspace = kilobytes * _1K;
 }
+
+
+#define COUNTING_COUTER(name, dsc) \
+void slirp_counting_counter_##name##_reset(PNATState pData) \
+{                                                           \
+    SLIRP_COUNTER_RESET(name);                              \
+}                                                           \
+void slirp_counting_counter_##name##_inc(PNATState pData)   \
+{                                                           \
+    SLIRP_COUNTER_INC(name);                                \
+}                                                           \
+void slirp_counting_counter_##name##_add(PNATState pData,int val)   \
+{                                                           \
+    SLIRP_COUNTER_ADD(name, val);                           \
+}
+/* @todo think abaout it */
+#define PROFILE_COUNTER(name, dsc) 
+#include "counters.h"
+#undef COUNTING_COUTER
+#undef PROFILE_COUNTER
+