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

Timestamp:

Jul 17, 2009 1:49:42 PM (16 years ago)

Author:

vboxsync

Message:

NAT: counters

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• counters.h (modified) (1 diff)
• ip_input.c (modified) (6 diffs)
• ip_output.c (modified) (4 diffs)
• sbuf.c (modified) (2 diffs)

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

@@ -74 +74 @@
 PROFILE_COUNTER(TCP_reassamble, "TCP::reasamble");
 PROFILE_COUNTER(TCP_input, "TCP::input");
+PROFILE_COUNTER(IP_input, "IP::input");
+PROFILE_COUNTER(IP_output, "IP::output");
+#ifdef VBOX_WITH_SLIRP_ALIAS
+PROFILE_COUNTER(ALIAS_input, "ALIAS::input");
+PROFILE_COUNTER(ALIAS_output, "ALIAS::output");
+#endif
 

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

@@ -77 +77 @@
     register struct ip *ip;
     int hlen = 0;
+    STAM_PROFILE_START(&pData->StatIP_input, a);
+    STAM_PROFILE_START(&pData->StatALIAS_input, b);
 
     DEBUG_CALL("ip_input");
@@ -90 +92 @@
         rc = LibAliasIn(m->m_la ? m->m_la : pData->proxy_alias, mtod(m, char *), 
             m->m_len);
+        STAM_PROFILE_STOP(&pData->StatALIAS_input, b);
         Log2(("NAT: LibAlias return %d\n", rc));
     }
@@ -97 +100 @@
     {
         ipstat.ips_toosmall++;
+        STAM_PROFILE_STOP(&pData->StatIP_input, a);
         return;
     }
@@ -174 +178 @@
         m = ip_reass(pData, m);
         if (m == NULL)
-            return;
+        {
+             STAM_PROFILE_STOP(&pData->StatIP_input, a);
+             return;
+        }
         ip = mtod(m, struct ip *);
         hlen = ip->ip_len;
@@ -200 +207 @@
             m_free(pData, m);
     }
+    STAM_PROFILE_STOP(&pData->StatIP_input, a);
     return;
 bad:
@@ -205 +213 @@
         &ip->ip_dst, ip->ip_len));
     m_freem(pData, m);
+    STAM_PROFILE_STOP(&pData->StatIP_input, a);
     return;
 }

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

@@ -89 +89 @@
     const uint8_t *eth_dst = NULL;
 #endif
+    STAM_PROFILE_START(&pData->StatIP_output, a);
+    STAM_PROFILE_START(&pData->StatALIAS_output, b);
 
     DEBUG_CALL("ip_output");
@@ -156 +158 @@
                 mtod(m, char *), m->m_len);
             Log2(("NAT: LibAlias return %d\n", rc));
+            STAM_PROFILE_STOP(&pData->StatALIAS_output, b);
         }
 #endif
@@ -258 +261 @@
                 mtod(m, char *), m->m_len);
             Log2(("NAT: LibAlias return %d\n", rc));
+            STAM_PROFILE_STOP(&pData->StatALIAS_output, b);
         }
 #endif
@@ -289 +293 @@
 
 done:
+    STAM_PROFILE_STOP(&pData->StatIP_output, a);
     return (error);
 
 bad:
     m_freem(pData, m0);
+    STAM_PROFILE_STOP(&pData->StatIP_output, a);
     goto done;
 }

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

@@ -83 +83 @@
     DEBUG_ARG("m = %lx", (long)m);
     DEBUG_ARG("m->m_len = %d", m->m_len);
-
-    STAM_COUNTER_RESET(&pData->StatIOSBAppend);
-    STAM_COUNTER_RESET(&pData->StatIOSBAppend_zm);
-    STAM_COUNTER_RESET(&pData->StatIOSBAppend_wa);
-    STAM_COUNTER_RESET(&pData->StatIOSBAppend_wf);
-    STAM_COUNTER_RESET(&pData->StatIOSBAppend_wp);
 
     STAM_COUNTER_INC(&pData->StatIOSBAppend);
@@ -162 +156 @@
     len = m->m_len;
 
-    STAM_COUNTER_RESET(&pData->StatIOSBAppendSB);
-    STAM_COUNTER_RESET(&pData->StatIOSBAppendSB_w_l_r);
-    STAM_COUNTER_RESET(&pData->StatIOSBAppendSB_w_ge_r);
-    STAM_COUNTER_RESET(&pData->StatIOSBAppendSB_w_alter);
-
     STAM_COUNTER_INC(&pData->StatIOSBAppendSB);
     if (sb->sb_wptr < sb->sb_rptr)