Changeset 20712 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Jun 19, 2009 11:33:32 AM (16 years ago)

Author:

vboxsync

Message:

DrvNat,slirp: simplify statistics and deregister them.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• counters.h (modified) (2 diffs)
• libslirp.h (modified) (1 diff)
• sbuf.c (modified) (8 diffs)
• slirp.c (modified) (45 diffs)
• slirp.h (modified) (2 diffs)
• slirp_state.h (modified) (5 diffs)
• socket.c (modified) (10 diffs)
• statistics.h (added)
• tcp_input.c (modified) (28 diffs)

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

@@ -1 +1 @@
 /** $Id$ */
 /** @file
- * Counters definitions and declarations
+ * Counters macro invocation template.
+ *
+ * This is included with different PROFILE_COUNTER and COUNTING_COUNTER
+ * implementations to instantiate data members, create function prototypes and
+ * implement these prototypes.
  */
 
 /*
- * Copyright (C) 2007 Sun Microsystems, Inc.
+ * Copyright (C) 2007-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +23 @@
  * additional information or have any questions.
  */
+
 #ifndef PROFILE_COUNTER
 # error PROFILE_COUNTER is not defied
 #endif
 #ifndef COUNTING_COUNTER
-#error COUNTING_COUNTER is not defined
+# error COUNTING_COUNTER is not defined
 #endif
 
-PROFILE_COUNTER(Fill, "Profiling slirp fills")
-PROFILE_COUNTER(Poll, "Profiling slirp polls")
-PROFILE_COUNTER(FastTimer, "Profiling slirp fast timer")
-PROFILE_COUNTER(SlowTimer, "Profiling slirp slow timer")
-PROFILE_COUNTER(IOwrite, "Profiling IO sowrite")
-PROFILE_COUNTER(IOread, "Profiling IO soread")
+PROFILE_COUNTER(Fill, "Profiling slirp fills");
+PROFILE_COUNTER(Poll, "Profiling slirp polls");
+PROFILE_COUNTER(FastTimer, "Profiling slirp fast timer");
+PROFILE_COUNTER(SlowTimer, "Profiling slirp slow timer");
+PROFILE_COUNTER(IOwrite, "Profiling IO sowrite");
+PROFILE_COUNTER(IOread, "Profiling IO soread");
 
-COUNTING_COUNTER(TCP, "TCP sockets")
-COUNTING_COUNTER(TCPHot, "TCP sockets active")
-COUNTING_COUNTER(UDP, "UDP sockets")
-COUNTING_COUNTER(UDPHot, "UDP sockets active")
+COUNTING_COUNTER(TCP, "TCP sockets");
+COUNTING_COUNTER(TCPHot, "TCP sockets active");
+COUNTING_COUNTER(UDP, "UDP sockets");
+COUNTING_COUNTER(UDPHot, "UDP sockets active");
 
-COUNTING_COUNTER(IORead_in_1, "SB IORead_in_1")
-COUNTING_COUNTER(IORead_in_1_bytes, "SB IORead_in_1_bytes")
-COUNTING_COUNTER(IORead_in_2, "SB IORead_in_2")
-COUNTING_COUNTER(IORead_in_2_1st_bytes, "SB IORead_in_2_1st_bytes")
-COUNTING_COUNTER(IORead_in_2_2nd_bytes, "SB IORead_in_2_2nd_bytes")
-COUNTING_COUNTER(IOWrite_in_1, "SB IOWrite_in_1")
-COUNTING_COUNTER(IOWrite_in_1_bytes, "SB IOWrite_in_1_bytes")
-COUNTING_COUNTER(IOWrite_in_2, "SB IOWrite_in_2")
-COUNTING_COUNTER(IOWrite_in_2_1st_bytes, "SB IOWrite_in_2_1st_bytes")
-COUNTING_COUNTER(IOWrite_in_2_2nd_bytes, "SB IOWrite_in_2_2nd_bytes")
-COUNTING_COUNTER(IOWrite_no_w, "SB IOWrite_no_w")
-COUNTING_COUNTER(IOWrite_rest, "SB IOWrite_rest")
-COUNTING_COUNTER(IOWrite_rest_bytes, "SB IOWrite_rest_bytes")
+COUNTING_COUNTER(IORead_in_1, "SB IORead_in_1");
+COUNTING_COUNTER(IORead_in_1_bytes, "SB IORead_in_1_bytes");
+COUNTING_COUNTER(IORead_in_2, "SB IORead_in_2");
+COUNTING_COUNTER(IORead_in_2_1st_bytes, "SB IORead_in_2_1st_bytes");
+COUNTING_COUNTER(IORead_in_2_2nd_bytes, "SB IORead_in_2_2nd_bytes");
+COUNTING_COUNTER(IOWrite_in_1, "SB IOWrite_in_1");
+COUNTING_COUNTER(IOWrite_in_1_bytes, "SB IOWrite_in_1_bytes");
+COUNTING_COUNTER(IOWrite_in_2, "SB IOWrite_in_2");
+COUNTING_COUNTER(IOWrite_in_2_1st_bytes, "SB IOWrite_in_2_1st_bytes");
+COUNTING_COUNTER(IOWrite_in_2_2nd_bytes, "SB IOWrite_in_2_2nd_bytes");
+COUNTING_COUNTER(IOWrite_no_w, "SB IOWrite_no_w");
+COUNTING_COUNTER(IOWrite_rest, "SB IOWrite_rest");
+COUNTING_COUNTER(IOWrite_rest_bytes, "SB IOWrite_rest_bytes");
 
-PROFILE_COUNTER(IOSBAppend_pf, "Profiling sbuf::append common")
-PROFILE_COUNTER(IOSBAppend_pf_wa, "Profiling sbuf::append all writen in network")
-PROFILE_COUNTER(IOSBAppend_pf_wf, "Profiling sbuf::append writen fault")
-PROFILE_COUNTER(IOSBAppend_pf_wp, "Profiling sbuf::append writen partly")
-COUNTING_COUNTER(IOSBAppend, "SB: Append total")
-COUNTING_COUNTER(IOSBAppend_wa, "SB: Append all is written to network ")
-COUNTING_COUNTER(IOSBAppend_wf, "SB: Append nothing is written")
-COUNTING_COUNTER(IOSBAppend_wp, "SB: Append is written partly")
-COUNTING_COUNTER(IOSBAppend_zm, "SB: Append mbuf is zerro or less")
+PROFILE_COUNTER(IOSBAppend_pf, "Profiling sbuf::append common");
+PROFILE_COUNTER(IOSBAppend_pf_wa, "Profiling sbuf::append all writen in network");
+PROFILE_COUNTER(IOSBAppend_pf_wf, "Profiling sbuf::append writen fault");
+PROFILE_COUNTER(IOSBAppend_pf_wp, "Profiling sbuf::append writen partly");
+COUNTING_COUNTER(IOSBAppend, "SB: Append total");
+COUNTING_COUNTER(IOSBAppend_wa, "SB: Append all is written to network ");
+COUNTING_COUNTER(IOSBAppend_wf, "SB: Append nothing is written");
+COUNTING_COUNTER(IOSBAppend_wp, "SB: Append is written partly");
+COUNTING_COUNTER(IOSBAppend_zm, "SB: Append mbuf is zerro or less");
 
-COUNTING_COUNTER(IOSBAppendSB, "SB: AppendSB total")
-COUNTING_COUNTER(IOSBAppendSB_w_l_r, "SB: AppendSB (sb_wptr < sb_rptr)")
-COUNTING_COUNTER(IOSBAppendSB_w_ge_r, "SB: AppendSB (sb_wptr >= sb_rptr)")
-COUNTING_COUNTER(IOSBAppendSB_w_alter, "SB: AppendSB (altering of sb_wptr)")
+COUNTING_COUNTER(IOSBAppendSB, "SB: AppendSB total");
+COUNTING_COUNTER(IOSBAppendSB_w_l_r, "SB: AppendSB (sb_wptr < sb_rptr)");
+COUNTING_COUNTER(IOSBAppendSB_w_ge_r, "SB: AppendSB (sb_wptr >= sb_rptr)");
+COUNTING_COUNTER(IOSBAppendSB_w_alter, "SB: AppendSB (altering of sb_wptr)");
 
-PROFILE_COUNTER(TCP_reassamble, "TCP::reasamble")
-PROFILE_COUNTER(TCP_input, "TCP::input")
+PROFILE_COUNTER(TCP_reassamble, "TCP::reasamble");
+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")
+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/libslirp.h

@@ -33 +33 @@
 int slirp_init(PNATState *, uint32_t, uint32_t, bool, void *);
 #endif
-void slirp_register_timers(PNATState pData, PPDMDRVINS pDrvIns);
+void slirp_register_statistics(PNATState pData, PPDMDRVINS pDrvIns);
+void slirp_deregister_statistics(PNATState pData, PPDMDRVINS pDrvIns);
 void slirp_term(PNATState);
 void slirp_link_up(PNATState);

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

@@ -78 +78 @@
     int ret = 0;
 
-    SLIRP_PROFILE_START(IOSBAppend_pf, a);
+    STAM_PROFILE_START(&pData->StatIOSBAppend_pf, a);
     DEBUG_CALL("sbappend");
     DEBUG_ARG("so = %lx", (long)so);
@@ -84 +84 @@
     DEBUG_ARG("m->m_len = %d", m->m_len);
 
-    SLIRP_COUNTER_RESET(IOSBAppend);
-    SLIRP_COUNTER_RESET(IOSBAppend_zm);
-    SLIRP_COUNTER_RESET(IOSBAppend_wa);
-    SLIRP_COUNTER_RESET(IOSBAppend_wf);
-    SLIRP_COUNTER_RESET(IOSBAppend_wp);
-
-    SLIRP_COUNTER_INC(IOSBAppend);
+    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);
     /* Shouldn't happen, but...  e.g. foreign host closes connection */
     if (m->m_len <= 0)
     {
-        SLIRP_COUNTER_INC(IOSBAppend_zm);
+        STAM_COUNTER_INC(&pData->StatIOSBAppend_zm);
         goto done;
     }
@@ -120 +120 @@
     if (ret <= 0)
     {
-        SLIRP_COUNTER_INC(IOSBAppend_wf);
+        STAM_COUNTER_INC(&pData->StatIOSBAppend_wf);
         /*
          * Nothing was written
@@ -128 +128 @@
          */
         sbappendsb(pData, &so->so_rcv, m);
-        SLIRP_PROFILE_STOP(IOSBAppend_pf_wf, a);
+        STAM_PROFILE_STOP(&pData->StatIOSBAppend_pf_wf, a);
         goto done;
     }
     else if (ret != m->m_len)
     {
-        SLIRP_COUNTER_INC(IOSBAppend_wp);
+        STAM_COUNTER_INC(&pData->StatIOSBAppend_wp);
         /*
          * Something was written, but not everything..
@@ -141 +141 @@
         m->m_data += ret;
         sbappendsb(pData, &so->so_rcv, m);
-        SLIRP_PROFILE_STOP(IOSBAppend_pf_wp, a);
+        STAM_PROFILE_STOP(&pData->StatIOSBAppend_pf_wp, a);
         goto done;
     } /* else */
     /* Whatever happened, we free the mbuf */
-    SLIRP_COUNTER_INC(IOSBAppend_wa);
-    SLIRP_PROFILE_STOP(IOSBAppend_pf_wa, a);
+    STAM_COUNTER_INC(&pData->StatIOSBAppend_wa);
+    STAM_PROFILE_STOP(&pData->StatIOSBAppend_pf_wa, a);
 done:
     m_free(pData, m);
@@ -162 +162 @@
     len = m->m_len;
 
-    SLIRP_COUNTER_RESET(IOSBAppendSB);
-    SLIRP_COUNTER_RESET(IOSBAppendSB_w_l_r);
-    SLIRP_COUNTER_RESET(IOSBAppendSB_w_ge_r);
-    SLIRP_COUNTER_RESET(IOSBAppendSB_w_alter);
-
-    SLIRP_COUNTER_INC(IOSBAppendSB);
+    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)
     {
-        SLIRP_COUNTER_INC(IOSBAppendSB_w_l_r);
+        STAM_COUNTER_INC(&pData->StatIOSBAppendSB_w_l_r);
         n = sb->sb_rptr - sb->sb_wptr;
         if (n > len)
@@ -178 +178 @@
     else
     {
-        SLIRP_COUNTER_INC(IOSBAppendSB_w_ge_r);
+        STAM_COUNTER_INC(&pData->StatIOSBAppendSB_w_ge_r);
         /* Do the right edge first */
         n = sb->sb_data + sb->sb_datalen - sb->sb_wptr;
@@ -200 +200 @@
     if (sb->sb_wptr >= sb->sb_data + sb->sb_datalen)
     {
-        SLIRP_COUNTER_INC(IOSBAppendSB_w_alter);
+        STAM_COUNTER_INC(&pData->StatIOSBAppendSB_w_alter);
         sb->sb_wptr -= sb->sb_datalen;
     }

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

@@ -19 +19 @@
 #endif
 #ifdef VBOX_WITH_SLIRP_ALIAS
-# include<alias.h>
+# include <alias.h>
+#endif
+
+#ifdef VBOX_WITH_STATISTICS
+# include "statistics.h"
 #endif
 
@@ -463 +467 @@
     snprintf(buff, sizeof(buff), "%s/resolv.conf", home);
     f = fopen(buff, "r");
-    if (f != NULL) 
+    if (f != NULL)
     {
         Log(("NAT: DNS we're using %s\n", buff));
@@ -705 +709 @@
         ftp_alias_load();
         nbt_alias_load();
-        
+
     }
 #endif
@@ -711 +715 @@
 }
 
+/* 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
+
 /**
- * Statistics counters.
+ * Register statistics.
  */
-void slirp_register_timers(PNATState pData, PPDMDRVINS pDrvIns)
+void slirp_register_statistics(PNATState pData, PPDMDRVINS pDrvIns)
 {
 #ifdef VBOX_WITH_STATISTICS
 # 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_COUNTER(name, dsc) \
-    COUNTER(name, STAMTYPE_COUNTER, STAMUNIT_COUNT, dsc); 
-
-#include "counters.h"
-
-#undef COUNTER
-#undef PROFILE_COUNTER
-#undef COUNTING_COUNTER
-
+    do {                                                            \
+        ASMAtomicUoWriteU32(&g_offSlirpStat##name,                  \
+                            RT_UOFFSETOF(NATState, Stat##name));    \
+        PDMDrvHlpSTAMRegisterF(pDrvIns,                             \
+                               &pData->Stat ## name,                \
+                               type,                                \
+                               STAMVISIBILITY_ALWAYS,               \
+                               units,                               \
+                               dsc,                                 \
+                               "/Drivers/NAT%u/Stat" #name,         \
+                               pDrvIns->iInstance);                 \
+    } while (0)
+
+# define PROFILE_COUNTER(name, dsc)     COUNTER(name, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc)
+# define COUNTING_COUNTER(name, dsc)    COUNTER(name, STAMTYPE_COUNTER, STAMUNIT_COUNT,          dsc)
+
+# include "counters.h"
+
+# undef COUNTER
+# undef PROFILE_COUNTER
+# undef COUNTING_COUNTER
+#endif /* VBOX_WITH_STATISTICS */
+}
+
+/**
+ * Deregister statistics.
+ */
+void slirp_deregister_statistics(PNATState pData, PPDMDRVINS pDrvIns)
+{
+#ifdef VBOX_WITH_STATISTICS
+# define PROFILE_COUNTER(name, dsc)     PDMDrvHlpSTAMDeregister(pDrvIns, &pData->Stat ## name)
+# define COUNTING_COUNTER(name, dsc)    PDMDrvHlpSTAMDeregister(pDrvIns, &pData->Stat ## name)
+
+# include "counters.h"
+
+# undef COUNTING_COUNTER
+# undef PROFILE_COUNTER
 #endif /* VBOX_WITH_STATISTICS */
 }
@@ -864 +893 @@
     int i;
 
-    SLIRP_PROFILE_START(Fill, a);
+    STAM_PROFILE_START(&pData->StatFill, a);
 
     nfds = *pnfds;
@@ -894 +923 @@
     }
     ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds);
-    
-    SLIRP_COUNTER_RESET(TCP);
-    SLIRP_COUNTER_RESET(TCPHot);
-    
+
+    STAM_COUNTER_RESET(&pData->StatTCP);
+    STAM_COUNTER_RESET(&pData->StatTCPHot);
+
     QSOCKET_FOREACH(so, so_next, tcp)
     /* { */
@@ -903 +932 @@
         so->so_poll_index = -1;
 #endif
-        SLIRP_COUNTER_INC(TCP);
-    
+        STAM_COUNTER_INC(&pData->StatTCP);
+
         /*
          * See if we need a tcp_fasttimo
@@ -912 +941 @@
                 && so->so_tcpcb->t_flags & TF_DELACK)
             time_fasttimo = curtime; /* Flag when we want a fasttimo */
-    
+
         /*
          * NOFDREF can include still connecting to local-host,
@@ -919 +948 @@
         if (so->so_state & SS_NOFDREF || so->s == -1)
             CONTINUE(tcp);
-    
+
         /*
          * Set for reading sockets which are accepting
@@ -925 +954 @@
         if (so->so_state & SS_FACCEPTCONN)
         {
-            SLIRP_COUNTER_INC(TCPHot);
+            STAM_COUNTER_INC(&pData->StatTCPHot);
             TCP_ENGAGE_EVENT1(so, readfds);
             CONTINUE(tcp);
         }
-    
+
         /*
          * Set for writing sockets which are connecting
@@ -936 +965 @@
         {
             Log2(("connecting %R[natsock] engaged\n",so));
-            SLIRP_COUNTER_INC(TCPHot);
+            STAM_COUNTER_INC(&pData->StatTCPHot);
             TCP_ENGAGE_EVENT1(so, writefds);
         }
-    
+
         /*
          * Set for writing if we are connected, can send more, and
@@ -946 +975 @@
         if (CONN_CANFSEND(so) && so->so_rcv.sb_cc)
         {
-            SLIRP_COUNTER_INC(TCPHot);
+            STAM_COUNTER_INC(&pData->StatTCPHot);
             TCP_ENGAGE_EVENT1(so, writefds);
         }
-    
+
         /*
          * Set for reading (and urgent data) if we are connected, can
@@ -956 +985 @@
         if (CONN_CANFRCV(so) && (so->so_snd.sb_cc < (so->so_snd.sb_datalen/2)))
         {
-            SLIRP_COUNTER_INC(TCPHot);
+            STAM_COUNTER_INC(&pData->StatTCPHot);
             TCP_ENGAGE_EVENT2(so, readfds, xfds);
         }
         LOOP_LABEL(tcp, so, so_next);
     }
-    
+
     /*
      * UDP sockets
      */
-    SLIRP_COUNTER_RESET(UDP);
-    SLIRP_COUNTER_RESET(UDPHot);
-    
+    STAM_COUNTER_RESET(&pData->StatUDP);
+    STAM_COUNTER_RESET(&pData->StatUDPHot);
+
     QSOCKET_FOREACH(so, so_next, udp)
     /* { */
-    
-        SLIRP_COUNTER_INC(UDP);
+
+        STAM_COUNTER_INC(&pData->StatUDP);
 #if !defined(RT_OS_WINDOWS)
         so->so_poll_index = -1;
@@ -1000 +1029 @@
                 do_slowtimo = 1; /* Let socket expire */
         }
-    
+
         /*
          * When UDP packets are received from over the link, they're
@@ -1013 +1042 @@
         if ((so->so_state & SS_ISFCONNECTED) && so->so_queued <= 4)
         {
-            SLIRP_COUNTER_INC(UDPHot);
+            STAM_COUNTER_INC(&pData->StatUDPHot);
             UDP_ENGAGE_EVENT(so, readfds);
         }
@@ -1027 +1056 @@
 #endif /* !RT_OS_WINDOWS */
 
-    SLIRP_PROFILE_STOP(Fill, a);
+    STAM_PROFILE_STOP(&pData->StatFill, a);
 }
 
@@ -1046 +1075 @@
 #endif
 
-    SLIRP_PROFILE_START(Poll, a);
+    STAM_PROFILE_START(&pData->StatPoll, a);
 
     /* Update time */
@@ -1058 +1087 @@
         if (time_fasttimo && ((curtime - time_fasttimo) >= 2))
         {
-            SLIRP_PROFILE_START(FastTimer, a);
+            STAM_PROFILE_START(&pData->StatFastTimer, a);
             tcp_fasttimo(pData);
             time_fasttimo = 0;
-            SLIRP_PROFILE_STOP(FastTimer, a);
+            STAM_PROFILE_STOP(&pData->StatFastTimer, a);
         }
         if (do_slowtimo && ((curtime - last_slowtimo) >= 499))
         {
-            SLIRP_PROFILE_START(SlowTimer, a);
+            STAM_PROFILE_START(&pData->StatSlowTimer, a);
             ip_slowtimo(pData);
             tcp_slowtimo(pData);
             last_slowtimo = curtime;
-            SLIRP_PROFILE_STOP(SlowTimer, a);
+            STAM_PROFILE_STOP(&pData->StatSlowTimer, a);
         }
     }
@@ -1081 +1110 @@
      */
     if (!link_up)
-        goto done; 
+        goto done;
 #if defined(RT_OS_WINDOWS)
     /*XXX: before renaming please make see define
@@ -1135 +1164 @@
         if (so->so_state & SS_NOFDREF || so->s == -1)
             CONTINUE(tcp);
-        
+
         POLL_TCP_EVENTS(rc, error, so, &NetworkEvents);
-        
+
         LOG_NAT_SOCK(so, TCP, &NetworkEvents, readfds, writefds, xfds);
-        
-        
+
+
         /*
          * Check for URG data
@@ -1146 +1175 @@
          * test for readfds below if this succeeds
          */
-        
+
         /* out-of-band data */
         if (CHECK_FD_SET(so, NetworkEvents, xfds))
@@ -1152 +1181 @@
             sorecvoob(pData, so);
         }
-        
+
         /*
          * Check sockets for reading
@@ -1170 +1199 @@
                     CONTINUE(tcp);
             }
-        
+
             ret = soread(pData, so);
             /* Output it if we read something */
@@ -1200 +1229 @@
         }
 #endif
-        
+
         /*
          * Check sockets for writing
@@ -1214 +1243 @@
                 /* Connected */
                 so->so_state &= ~SS_ISFCONNECTING;
-        
+
                 /*
                  * This should be probably guarded by PROBE_CONN too. Anyway,
@@ -1231 +1260 @@
                         || errno == ENOTCONN)
                         CONTINUE(tcp);
-                
+
                     /* else failed */
                     so->so_state = SS_NOFDREF;
@@ -1237 +1266 @@
                 /* else so->so_state &= ~SS_ISFCONNECTING; */
 #endif
-        
+
                 /*
                  * Continue tcp_input
@@ -1252 +1281 @@
              */
         }
-        
+
         /*
          * Probe a still-connecting, non-blocking socket
@@ -1261 +1290 @@
         {
             ret = recv(so->s, (char *)&ret, 0, 0);
-        
+
             if (ret < 0)
             {
@@ -1272 +1301 @@
                     CONTINUE(tcp); /* Still connecting, continue */
                 }
-        
+
                 /* else failed */
                 so->so_state = SS_NOFDREF;
-        
+
                 /* tcp_input will take care of it */
             }
@@ -1296 +1325 @@
                 else
                     so->so_state &= ~SS_ISFCONNECTING;
-        
+
             }
             TCP_INPUT((struct mbuf *)NULL, sizeof(struct ip),so);
@@ -1417 +1446 @@
 #endif
         POLL_UDP_EVENTS(rc, error, so, &NetworkEvents);
-    
+
         LOG_NAT_SOCK(so, UDP, &NetworkEvents, readfds, writefds, xfds);
-    
+
         if (so->s != -1 && CHECK_FD_SET(so, NetworkEvents, readfds))
         {
@@ -1436 +1465 @@
 #endif
 
-    SLIRP_PROFILE_STOP(Poll, a);
+    STAM_PROFILE_STOP(&pData->StatPoll, a);
 }
 
@@ -1492 +1521 @@
 #ifdef VBOX_WITHOUT_SLIRP_CLIENT_ETHER
     reh = mtod(mr, struct ethhdr *);
-    memcpy(reh->h_source, eh->h_source, ETH_ALEN); /* XXX: if_encap will swap src and dst*/ 
+    memcpy(reh->h_source, eh->h_source, ETH_ALEN); /* XXX: if_encap will swap src and dst*/
     Log4(("NAT: arp:%R[ether]->%R[ether]\n",
         reh->h_source, reh->h_dest));
@@ -1516 +1545 @@
                 for (ex_ptr = exec_list; ex_ptr; ex_ptr = ex_ptr->ex_next)
                 {
-                    if ((htip & ~pData->netmask) == ex_ptr->ex_addr) 
+                    if ((htip & ~pData->netmask) == ex_ptr->ex_addr)
                     {
                         goto arp_ok;
@@ -1566 +1595 @@
     Log4(("NAT: in:%R[ether]->%R[ether]\n", &eh->h_source, &eh->h_dest));
 #ifdef VBOX_WITHOUT_SLIRP_CLIENT_ETHER
-    if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) == 0) 
+    if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) == 0)
     {
         /* @todo vasily: add ether logging routine in debug.c */
@@ -1628 +1657 @@
     m->m_len += ETH_HLEN;
     eh = mtod(m, struct ethhdr *);
-    
+
     if(MBUF_HEAD(m) != m->m_data)
     {
@@ -1641 +1670 @@
     eh->h_source[5] = CTL_ALIAS;
 #else
-    if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) != 0) 
+    if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) != 0)
     {
         memcpy(eh->h_dest, eh->h_source, ETH_ALEN);
@@ -1699 +1728 @@
     psin->sin_addr.s_addr = INADDR_ANY;
     socketlen = sizeof(struct sockaddr);
-    
-    rc = getsockname(so->s, &sa, &socketlen); 
-    if (rc < 0 || sa.sa_family != AF_INET) 
+
+    rc = getsockname(so->s, &sa, &socketlen);
+    if (rc < 0 || sa.sa_family != AF_INET)
     {
         Log(("NAT: can't get socket's name\n"));
@@ -1708 +1737 @@
 
     psin = (struct sockaddr_in *)&sa;
-    
+
 #if 1
     lib = LibAliasInit(pData, NULL);
@@ -1724 +1753 @@
         special_addr,  -1, /* not very clear for now*/
         (is_udp ? IPPROTO_UDP : IPPROTO_TCP));
-    if (link == NULL) 
+    if (link == NULL)
     {
         Log(("NAT: can't create redirect\n"));
@@ -1730 +1759 @@
     }
     so->so_la = lib;
-    
+
     return 0;
 #endif
@@ -1765 +1794 @@
     {
         if (time_fasttimo)
-            return 2; 
+            return 2;
         if (do_slowtimo)
             return 500; /* see PR_SLOWHZ */
@@ -1813 +1842 @@
         case 500:
                 if (hsport != 500) /* vpnc by default try operate in src:500/dst:500 mode*/
-                /* Not sure why this make Cisco VPN client's connection more stable, 
+                /* Not sure why this make Cisco VPN client's connection more stable,
                  * at least on some servers
                  */
-                    service = sport;  
+                    service = sport;
         break;
     }
@@ -1870 +1899 @@
 void slirp_set_rcvbuf(PNATState pData, int kilobytes)
 {
-    _8K_1M_CHECK_ARG("SOCKET_RCVBUF", kilobytes);    
+    _8K_1M_CHECK_ARG("SOCKET_RCVBUF", kilobytes);
     pData->socket_rcv = kilobytes;
 }
 void slirp_set_sndbuf(PNATState pData, int kilobytes)
 {
-    _8K_1M_CHECK_ARG("SOCKET_SNDBUF", kilobytes);    
+    _8K_1M_CHECK_ARG("SOCKET_SNDBUF", kilobytes);
     pData->socket_snd = kilobytes * _1K;
 }
 void slirp_set_tcp_rcvspace(PNATState pData, int kilobytes)
 {
-    _8K_1M_CHECK_ARG("TCP_RCVSPACE", kilobytes);    
+    _8K_1M_CHECK_ARG("TCP_RCVSPACE", kilobytes);
     tcp_rcvspace = kilobytes * _1K;
 }
 void slirp_set_tcp_sndspace(PNATState pData, int kilobytes)
 {
-    _8K_1M_CHECK_ARG("TCP_SNDSPACE", kilobytes);    
+    _8K_1M_CHECK_ARG("TCP_SNDSPACE", kilobytes);
     tcp_sndspace = kilobytes * _1K;
 }
 
-#ifdef VBOX_WITH_STATISTICS
-/*definitions */
-#define COUNTING_COUNTER(name, dsc) \
-void slirp_counting_counter_##name##_reset(PNATState);      \
-void slirp_counting_counter_##name##_inc(PNATState);        \
-void slirp_counting_counter_##name##_add(PNATState,int );   \
-/* @todo think abaout it */
-#define PROFILE_COUNTER(name, dsc) 
-#include "counters.h"
-#undef COUNTING_COUNTER
-#undef PROFILE_COUNTER
-
-/*declarations*/
-#define COUNTING_COUNTER(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_COUNTER
-#undef PROFILE_COUNTER
-#endif

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

@@ -370 +370 @@
 # define ip_next(ip) (void *)((uint8_t *)(ip) + ((ip)->ip_hl << 2))
 # define udp_next(udp) (void *)((uint8_t *)&((struct udphdr *)(udp))[1] )
-# define bcopy(src, dst, len) memcpy((dst), (src), (len)) 
-# define bcmp(a1, a2, len) memcmp((a1), (a2), (len)) 
+# define bcopy(src, dst, len) memcpy((dst), (src), (len))
+# define bcmp(a1, a2, len) memcmp((a1), (a2), (len))
 # define NO_FW_PUNCH
 
@@ -436 +436 @@
 #endif /*VBOX_WITH_SLIRP_ALIAS*/
 
-#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
+#endif
+

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

@@ -19 +19 @@
  */
 
-#ifndef _slirp_state_h_
-#define _slirp_state_h_
+#ifndef ___slirp_state_h
+#define ___slirp_state_h
+
 #include <iprt/req.h>
 #include "ip_icmp.h"
@@ -229 +230 @@
     int sock_answer;
     /* dnsproxy/hash.c */
-    #define HASHSIZE 10
-    #define HASH(id) (id & ((1 << HASHSIZE) - 1))
+# define HASHSIZE 10
+# define HASH(id) (id & ((1 << HASHSIZE) - 1))
     struct request *request_hash[1 << HASHSIZE];
     /* this field control behaviour of DHCP server */
@@ -240 +241 @@
 #endif
 
-# define PROFILE_COUNTER(name, dsc) STAMPROFILE Stat ## name;
-# define COUNTING_COUNTER(name, dsc) STAMCOUNTER Stat ## name;
+#define PROFILE_COUNTER(name, dsc)     STAMPROFILE Stat ## name
+#define COUNTING_COUNTER(name, dsc)    STAMCOUNTER Stat ## name
 
 #include "counters.h"
@@ -600 +601 @@
                 && so->so_fport        == (dport))                      \
                 {                                                       \
-                    if (sonxt != &VBOX_X2(queue_ ## label ## _label))       \
+                    if (sonxt != &VBOX_X2(queue_ ## label ## _label))   \
                         SOCKET_UNLOCK(sonxt);                           \
                     break; /*so is locked*/                             \
@@ -685 +686 @@
 #endif
 
-#endif /* !_slirp_state_h_ */
+#endif /* !___slirp_state_h */
+

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

@@ -125 +125 @@
     int mss = so->so_tcpcb->t_maxseg;
 
-    SLIRP_PROFILE_START(IOread, a);
-    SLIRP_COUNTER_RESET(IORead_in_1);
-    SLIRP_COUNTER_RESET(IORead_in_2);
+    STAM_PROFILE_START(&pData->StatIOread, a);
+    STAM_COUNTER_RESET(&pData->StatIORead_in_1);
+    STAM_COUNTER_RESET(&pData->StatIORead_in_2);
 
     QSOCKET_LOCK(tcb);
@@ -220 +220 @@
         {
             SOCKET_UNLOCK(so);
-            SLIRP_PROFILE_STOP(IOread, a);
+            STAM_PROFILE_STOP(&pData->StatIOread, a);
             return 0;
         }
@@ -244 +244 @@
     STAM_STATS(
         if (n == 1)
-        { 
+        {
             STAM_COUNTER_INC(&pData->StatIORead_in_1);
             STAM_COUNTER_ADD(&pData->StatIORead_in_1_bytes, nn);
@@ -274 +274 @@
             if(ret > 0)
             {
-                SLIRP_COUNTER_INC(IORead_in_2);
-                SLIRP_COUNTER_ADD(IORead_in_2_2nd_bytes, ret);
+                STAM_COUNTER_INC(&pData->StatIORead_in_2);
+                STAM_COUNTER_ADD(&pData->StatIORead_in_2_2nd_bytes, ret);
             }
         );
@@ -401 +401 @@
     struct iovec iov[2];
 
-    SLIRP_PROFILE_START(IOwrite, a);
-    SLIRP_COUNTER_RESET(IOWrite_in_1);
-    SLIRP_COUNTER_RESET(IOWrite_in_1_bytes);
-    SLIRP_COUNTER_RESET(IOWrite_in_2);
-    SLIRP_COUNTER_RESET(IOWrite_in_2_1st_bytes);
-    SLIRP_COUNTER_RESET(IOWrite_in_2_2nd_bytes);
-    SLIRP_COUNTER_RESET(IOWrite_no_w);
-    SLIRP_COUNTER_RESET(IOWrite_rest);
-    SLIRP_COUNTER_RESET(IOWrite_rest_bytes);
+    STAM_PROFILE_START(&pData->StatIOwrite, a);
+    STAM_COUNTER_RESET(&pData->StatIOWrite_in_1);
+    STAM_COUNTER_RESET(&pData->StatIOWrite_in_1_bytes);
+    STAM_COUNTER_RESET(&pData->StatIOWrite_in_2);
+    STAM_COUNTER_RESET(&pData->StatIOWrite_in_2_1st_bytes);
+    STAM_COUNTER_RESET(&pData->StatIOWrite_in_2_2nd_bytes);
+    STAM_COUNTER_RESET(&pData->StatIOWrite_no_w);
+    STAM_COUNTER_RESET(&pData->StatIOWrite_rest);
+    STAM_COUNTER_RESET(&pData->StatIOWrite_rest_bytes);
     DEBUG_CALL("sowrite");
     DEBUG_ARG("so = %lx", (long)so);
@@ -462 +462 @@
     }
     STAM_STATS({
-        if (n == 1) 
-        {
-            SLIRP_COUNTER_INC(IOWrite_in_1);
-            SLIRP_COUNTER_ADD(IOWrite_in_1_bytes, iov[0].iov_len);
+        if (n == 1)
+        {
+            STAM_COUNTER_INC(&pData->StatIOWrite_in_1);
+            STAM_COUNTER_ADD(&pData->StatIOWrite_in_1_bytes, iov[0].iov_len);
         }
         else
         {
-            SLIRP_COUNTER_INC(IOWrite_in_2);
-            SLIRP_COUNTER_ADD(IOWrite_in_2_1st_bytes, iov[0].iov_len);
-            SLIRP_COUNTER_ADD(IOWrite_in_2_2nd_bytes, iov[1].iov_len);
+            STAM_COUNTER_INC(&pData->StatIOWrite_in_2);
+            STAM_COUNTER_ADD(&pData->StatIOWrite_in_2_1st_bytes, iov[0].iov_len);
+            STAM_COUNTER_ADD(&pData->StatIOWrite_in_2_2nd_bytes, iov[1].iov_len);
         }
     });
@@ -510 +510 @@
             if (ret > 0 && ret != iov[1].iov_len)
             {
-                SLIRP_COUNTER_INC(IOWrite_rest);
-                SLIRP_COUNTER_ADD(IOWrite_rest_bytes, (ret - iov[1].iov_len));
+                STAM_COUNTER_INC(&pData->StatIOWrite_rest);
+                STAM_COUNTER_ADD(&pData->StatIOWrite_rest_bytes, (ret - iov[1].iov_len));
             }
         });
@@ -532 +532 @@
 
     SOCKET_UNLOCK(so);
-    SLIRP_PROFILE_STOP(IOwrite, a);
+    STAM_PROFILE_STOP(&pData->StatIOwrite, a);
     return nn;
 }
@@ -576 +576 @@
         }
         /* adjust both parameters to maks M_FREEROOM calculate correct */
-        m_adj(m, if_maxlinkhdr + sizeof(struct udphdr) + sizeof(struct ip)); 
+        m_adj(m, if_maxlinkhdr + sizeof(struct udphdr) + sizeof(struct ip));
 
         /*
@@ -635 +635 @@
                     so->so_expire = curtime + SO_EXPIRE;
             }
-            /* 
+            /*
              *  last argument should be changed if Slirp will inject IP attributes
              *  Note: Here we can't check if dnsproxy's sent initial request
              */
             if (so->so_fport == htons(53))
-                dnsproxy_answer(pData, so, m);  
+                dnsproxy_answer(pData, so, m);
 #endif
 

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

@@ -79 +79 @@
     struct socket *so = tp->t_socket;
     int flags;
-    SLIRP_PROFILE_START(TCP_reassamble, tcp_reassamble);
+    STAM_PROFILE_START(&pData->StatTCP_reassamble, tcp_reassamble);
 
     /*
@@ -109 +109 @@
         m_freem(pData, m);
         *tlenp = 0;
-        SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
+        STAM_PROFILE_STOP(&pData->StatTCP_reassamble, tcp_reassamble);
         return (0);
     }
@@ -123 +123 @@
         m_freem(pData, m);
         *tlenp = 0;
-        SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
+        STAM_PROFILE_STOP(&pData->StatTCP_reassamble, tcp_reassamble);
         return (0);
     }
@@ -222 +222 @@
     if (!TCPS_HAVEESTABLISHED(tp->t_state))
     {
-        SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
+        STAM_PROFILE_STOP(&pData->StatTCP_reassamble, tcp_reassamble);
         return (0);
     }
@@ -228 +228 @@
     if (!q || q->tqe_th->th_seq != tp->rcv_nxt)
     {
-        SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
+        STAM_PROFILE_STOP(&pData->StatTCP_reassamble, tcp_reassamble);
         return (0);
     }
@@ -247 +247 @@
             {
                 if (tcp_emu(pData, so, q->tqe_m))
-                    sbappend(pData, so, q->tqe_m); 
+                    sbappend(pData, so, q->tqe_m);
             }
             else
@@ -259 +259 @@
     while (q && q->tqe_th->th_seq == tp->rcv_nxt);
 
-    SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
+    STAM_PROFILE_STOP(&pData->StatTCP_reassamble, tcp_reassamble);
     return flags;
 }
@@ -283 +283 @@
     u_long tiwin;
 /*  int ts_present = 0; */
-    SLIRP_PROFILE_START(TCP_input, counter_input);
+    STAM_PROFILE_START(&pData->StatTCP_input, counter_input);
 
     DEBUG_CALL("tcp_input");
     DEBUG_ARGS((dfd," m = %8lx  iphlen = %2d  inso = %lx\n",
                 (long )m, iphlen, (long )inso ));
-    
-    if (inso != NULL) 
-    { 
+
+    if (inso != NULL)
+    {
         QSOCKET_LOCK(tcb);
         SOCKET_LOCK(inso);
@@ -314 +314 @@
                         /* mbuf should be cleared in sofree called from tcp_close */
                         tcp_close(pData, tp);
-                        SLIRP_PROFILE_STOP(TCP_input, counter_input);
+                        STAM_PROFILE_STOP(&pData->StatTCP_input, counter_input);
                         return;
                 }
@@ -431 +431 @@
         struct socket *sonxt;
         QSOCKET_UNLOCK(tcb);
-        /* @todo fix SOLOOKUP macrodefinition to be usable here */ 
+        /* @todo fix SOLOOKUP macrodefinition to be usable here */
 #ifndef VBOX_WITH_SLIRP_MT
         so = solookup(&tcb, ti->ti_src, ti->ti_sport,
@@ -437 +437 @@
 #else
         so = NULL;
-        QSOCKET_FOREACH(so, sonxt, tcp)        
+        QSOCKET_FOREACH(so, sonxt, tcp)
         /* { */
             if (   so->so_lport        == ti->ti_sport
@@ -443 +443 @@
                 && so->so_faddr.s_addr == ti->ti_dst.s_addr
                 && so->so_fport        == ti->ti_dport
-                && so->so_deleted != 1) 
+                && so->so_deleted != 1)
             {
                 break; /* so is locked here */
@@ -458 +458 @@
         }
         ++tcpstat.tcps_socachemiss;
-    } 
+    }
     else
     {
@@ -490 +490 @@
             goto dropwithreset;
         }
-        SOCKET_LOCK(so); 
+        SOCKET_LOCK(so);
         sbreserve(pData, &so->so_snd, tcp_sndspace);
         sbreserve(pData, &so->so_rcv, tcp_rcvspace);
@@ -514 +514 @@
      * or something else, we nuke it.
      */
-    if (so->so_state & SS_ISFCONNECTING) 
+    if (so->so_state & SS_ISFCONNECTING)
     {
         goto drop;
@@ -649 +649 @@
 
               SOCKET_UNLOCK(so);
-              SLIRP_PROFILE_STOP(TCP_input, counter_input);
+              STAM_PROFILE_STOP(&pData->StatTCP_input, counter_input);
               return;
             }
@@ -695 +695 @@
             tcp_output(pData, tp);
             SOCKET_UNLOCK(so);
-            SLIRP_PROFILE_STOP(TCP_input, counter_input);
+            STAM_PROFILE_STOP(&pData->StatTCP_input, counter_input);
             return;
         }
@@ -735 +735 @@
             if (tiflags & TH_ACK)
                 goto dropwithreset;
-            if ((tiflags & TH_SYN) == 0) 
+            if ((tiflags & TH_SYN) == 0)
             {
                 goto drop;
@@ -795 +795 @@
             }
             SOCKET_UNLOCK(so);
-            SLIRP_PROFILE_STOP(TCP_input, counter_input);
+            STAM_PROFILE_STOP(&pData->StatTCP_input, counter_input);
             return;
 
@@ -853 +853 @@
             }
 
-            if ((tiflags & TH_SYN) == 0) 
+            if ((tiflags & TH_SYN) == 0)
             {
                 goto drop;
@@ -1076 +1076 @@
     if (   ts_present
         && SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)
-        && SEQ_LT(tp->last_ack_sent, ti->ti_seq + ti->ti_len + ((tiflags & (TH_SYN|TH_FIN)) != 0))) 
+        && SEQ_LT(tp->last_ack_sent, ti->ti_seq + ti->ti_len + ((tiflags & (TH_SYN|TH_FIN)) != 0)))
     {
         tp->ts_recent_age = tcp_now;
@@ -1131 +1131 @@
      * If the ACK bit is off we drop the segment and return.
      */
-    if ((tiflags & TH_ACK) == 0) 
+    if ((tiflags & TH_ACK) == 0)
     {
         goto drop;
@@ -1520 +1520 @@
             if (so->so_state & SS_FCANTRCVMORE)
                 m_freem(pData, m);
-            else 
-            {
-                if (so->so_emu) 
+            else
+            {
+                if (so->so_emu)
                 {
                     if (tcp_emu(pData, so, m))
@@ -1622 +1622 @@
 
     SOCKET_UNLOCK(so);
-    SLIRP_PROFILE_STOP(TCP_input, counter_input);
+    STAM_PROFILE_STOP(&pData->StatTCP_input, counter_input);
     return;
 
@@ -1637 +1637 @@
     (void) tcp_output(pData, tp);
     SOCKET_UNLOCK(so);
-    SLIRP_PROFILE_STOP(TCP_input, counter_input);
+    STAM_PROFILE_STOP(&pData->StatTCP_input, counter_input);
     return;
 
@@ -1653 +1653 @@
     if (so != &tcb)
         SOCKET_UNLOCK(so);
-    SLIRP_PROFILE_STOP(TCP_input, counter_input);
+    STAM_PROFILE_STOP(&pData->StatTCP_input, counter_input);
     return;
 
@@ -1663 +1663 @@
 
 #ifdef VBOX_WITH_SLIRP_MT
-    if (RTCritSectIsOwned(&so->so_mutex)) 
+    if (RTCritSectIsOwned(&so->so_mutex))
     {
         SOCKET_UNLOCK(so);
@@ -1669 +1669 @@
 #endif
 
-    SLIRP_PROFILE_STOP(TCP_input, counter_input);
+    STAM_PROFILE_STOP(&pData->StatTCP_input, counter_input);
     return;
 }