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

Timestamp:

Jun 8, 2009 4:47:39 AM (16 years ago)

Author:

vboxsync

Message:

NAT: slirp performance counters

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• counters.h (modified) (1 diff)
• slirp.c (modified) (13 diffs)
• slirp.h (modified) (1 diff)

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

@@ -37 +37 @@
 COUNTING_COUTER(UDP, "UDP sockets");
 COUNTING_COUTER(UDPHot, "UDP sockets active");
-COUNTING_COUTER(SBAlloc, "SB Alloc");
-COUNTING_COUTER(SBReAlloc, "SB ReAlloc");
 
 COUNTING_COUTER(IORead_in_1, "SB IORead_in_1");
+COUNTING_COUTER(IORead_in_1_bytes, "SB IORead_in_1_bytes");
 COUNTING_COUTER(IORead_in_2, "SB IORead_in_2");
+COUNTING_COUTER(IORead_in_2_1st_bytes, "SB IORead_in_2_1st_bytes");
+COUNTING_COUTER(IORead_in_2_2nd_bytes, "SB IORead_in_2_2nd_bytes");
 COUNTING_COUTER(IOWrite_in_1, "SB IOWrite_in_1");
+COUNTING_COUTER(IOWrite_in_1_bytes, "SB IOWrite_in_1_bytes");
 COUNTING_COUTER(IOWrite_in_2, "SB IOWrite_in_2");
+COUNTING_COUTER(IOWrite_in_2_1st_bytes, "SB IOWrite_in_2_1st_bytes");
+COUNTING_COUTER(IOWrite_in_2_2nd_bytes, "SB IOWrite_in_2_2nd_bytes");
+COUNTING_COUTER(IOWrite_no_w, "SB IOWrite_no_w");
+COUNTING_COUTER(IOWrite_rest, "SB IOWrite_rest");
+COUNTING_COUTER(IOWrite_rest_bytes, "SB IOWrite_rest_bytes");
+
+COUNTING_COUTER(IOSBAppend, "SB: Append total");
+COUNTING_COUTER(IOSBAppend_wa, "SB: Append all is written to network ");
+COUNTING_COUTER(IOSBAppend_wf, "SB: Append nothing is written");
+COUNTING_COUTER(IOSBAppend_wp, "SB: Append is written partly");
+COUNTING_COUTER(IOSBAppend_zm, "SB: Append mbuf is zerro or less");
+
+COUNTING_COUTER(IOSBAppendSB, "SB: AppendSB total");
+COUNTING_COUTER(IOSBAppendSB_w_l_r, "SB: AppendSB (sb_wptr < sb_rptr)");
+COUNTING_COUTER(IOSBAppendSB_w_ge_r, "SB: AppendSB (sb_wptr >= sb_rptr)");
+COUNTING_COUTER(IOSBAppendSB_w_alter, "SB: AppendSB (altering of sb_wptr)");

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

@@ -858 +858 @@
     int i;
 
-    STAM_PROFILE_START(&pData->StatFill, a);
+    SLIRP_PROFILE_START(Fill, a);
 
     nfds = *pnfds;
@@ -889 +889 @@
     ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds);
     
-    STAM_COUNTER_RESET(&pData->StatTCP);
-    STAM_COUNTER_RESET(&pData->StatTCPHot);
+    SLIRP_COUNTER_RESET(TCP);
+    SLIRP_COUNTER_RESET(TCPHot);
     
     QSOCKET_FOREACH(so, so_next, tcp)
@@ -897 +897 @@
         so->so_poll_index = -1;
 #endif
-        STAM_COUNTER_INC(&pData->StatTCP);
+        SLIRP_COUNTER_INC(TCP);
     
         /*
@@ -919 +919 @@
         if (so->so_state & SS_FACCEPTCONN)
         {
-            STAM_COUNTER_INC(&pData->StatTCPHot);
+            SLIRP_COUNTER_INC(TCPHot);
             TCP_ENGAGE_EVENT1(so, readfds);
             CONTINUE(tcp);
@@ -930 +930 @@
         {
             Log2(("connecting %R[natsock] engaged\n",so));
-            STAM_COUNTER_INC(&pData->StatTCPHot);
+            SLIRP_COUNTER_INC(TCPHot);
             TCP_ENGAGE_EVENT1(so, writefds);
         }
@@ -940 +940 @@
         if (CONN_CANFSEND(so) && so->so_rcv.sb_cc)
         {
-            STAM_COUNTER_INC(&pData->StatTCPHot);
+            SLIRP_COUNTER_INC(TCPHot);
             TCP_ENGAGE_EVENT1(so, writefds);
         }
@@ -950 +950 @@
         if (CONN_CANFRCV(so) && (so->so_snd.sb_cc < (so->so_snd.sb_datalen/2)))
         {
-            STAM_COUNTER_INC(&pData->StatTCPHot);
+            SLIRP_COUNTER_INC(TCPHot);
             TCP_ENGAGE_EVENT2(so, readfds, xfds);
         }
@@ -959 +959 @@
      * UDP sockets
      */
-    STAM_COUNTER_RESET(&pData->StatUDP);
-    STAM_COUNTER_RESET(&pData->StatUDPHot);
+    SLIRP_COUNTER_RESET(UDP);
+    SLIRP_COUNTER_RESET(UDPHot);
     
     QSOCKET_FOREACH(so, so_next, udp)
     /* { */
     
-        STAM_COUNTER_INC(&pData->StatUDP);
+        SLIRP_COUNTER_INC(UDP);
 #if !defined(RT_OS_WINDOWS)
         so->so_poll_index = -1;
@@ -1007 +1007 @@
         if ((so->so_state & SS_ISFCONNECTED) && so->so_queued <= 4)
         {
-            STAM_COUNTER_INC(&pData->StatUDPHot);
+            SLIRP_COUNTER_INC(UDPHot);
             UDP_ENGAGE_EVENT(so, readfds);
         }
@@ -1021 +1021 @@
 #endif /* !RT_OS_WINDOWS */
 
-    STAM_PROFILE_STOP(&pData->StatFill, a);
+    SLIRP_PROFILE_STOP(Fill, a);
 }
 
@@ -1040 +1040 @@
 #endif
 
-    STAM_PROFILE_START(&pData->StatPoll, a);
+    SLIRP_PROFILE_START(Poll, a);
 
     /* Update time */
@@ -1052 +1052 @@
         if (time_fasttimo && ((curtime - time_fasttimo) >= 2))
         {
-            STAM_PROFILE_START(&pData->StatFastTimer, a);
+            SLIRP_PROFILE_START(FastTimer, a);
             tcp_fasttimo(pData);
             time_fasttimo = 0;
-            STAM_PROFILE_STOP(&pData->StatFastTimer, a);
+            SLIRP_PROFILE_STOP(FastTimer, a);
         }
         if (do_slowtimo && ((curtime - last_slowtimo) >= 499))
         {
-            STAM_PROFILE_START(&pData->StatSlowTimer, a);
+            SLIRP_PROFILE_START(SlowTimer, a);
             ip_slowtimo(pData);
             tcp_slowtimo(pData);
             last_slowtimo = curtime;
-            STAM_PROFILE_STOP(&pData->StatSlowTimer, a);
+            SLIRP_PROFILE_STOP(SlowTimer, a);
         }
     }
@@ -1430 +1430 @@
 #endif
 
-    STAM_PROFILE_STOP(&pData->StatPoll, a);
+    SLIRP_PROFILE_STOP(Poll, a);
 }
 

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

@@ -436 +436 @@
 #endif /*VBOX_WITH_SLIRP_ALIAS*/
 
-#endif
+#ifdef VBOX_WITH_STATISTICS
+#define VBOX_SLIRP_COUNTER_OPER_ARG0(name, type, op) \
+    STAM_##type##_##op(&pData->Stat##name)
+#define VBOX_SLIRP_COUNTER_OPER_ARG1(name, type, op, arg) \
+    STAM_##type##_##op(&pData->Stat##name, arg)
+#else
+#define VBOX_SLIRP_COUNTER_OPER_ARG0(name, type, op) do{}while(0)
+#define VBOX_SLIRP_COUNTER_OPER_ARG1(name, type, op, arg) do{}while(0)
+#endif
+
+#define SLIRP_PROFILE_START(name, arg) \
+    VBOX_SLIRP_COUNTER_OPER_ARG1(name, PROFILE, START, arg)
+#define SLIRP_PROFILE_STOP(name, arg)  \
+    VBOX_SLIRP_COUNTER_OPER_ARG1(name, PROFILE, STOP, arg)
+
+#define SLIRP_COUNTER_RESET(name) \
+    VBOX_SLIRP_COUNTER_OPER_ARG0(name, COUNTER, RESET)
+
+#define SLIRP_COUNTER_INC(name) \
+    VBOX_SLIRP_COUNTER_OPER_ARG0(name, COUNTER, INC)
+
+#define SLIRP_COUNTER_ADD(name, val) \
+    VBOX_SLIRP_COUNTER_OPER_ARG1(name, COUNTER, ADD, (val))
+
+#endif