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

Timestamp:

Jan 15, 2009 10:19:58 AM (16 years ago)

Author:

vboxsync

Message:

NAT: no release profile counters

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (16 diffs)

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

@@ -3 +3 @@
 # include <paths.h>
 #endif
-
-/* disable these counters for the final release */
-/* #define VBOX_WITHOUT_RELEASE_STATISTICS */
 
 #include <VBox/err.h>
@@ -521 +518 @@
     int i;
 
-    STAM_REL_PROFILE_START(&pData->StatFill, a);
+    STAM_PROFILE_START(&pData->StatFill, a);
 
     nfds = *pnfds;
@@ -552 +549 @@
         ICMP_ENGAGE_EVENT(&pData->icmp_socket, readfds);
 
-        STAM_REL_COUNTER_RESET(&pData->StatTCP);
-        STAM_REL_COUNTER_RESET(&pData->StatTCPHot);
+        STAM_COUNTER_RESET(&pData->StatTCP);
+        STAM_COUNTER_RESET(&pData->StatTCPHot);
 
         for (so = tcb.so_next; so != &tcb; so = so_next)
@@ -559 +556 @@
             so_next = so->so_next;
 
-            STAM_REL_COUNTER_INC(&pData->StatTCP);
+            STAM_COUNTER_INC(&pData->StatTCP);
 
             /*
@@ -579 +576 @@
             if (so->so_state & SS_FACCEPTCONN)
             {
-                STAM_REL_COUNTER_INC(&pData->StatTCPHot);
+                STAM_COUNTER_INC(&pData->StatTCPHot);
                 TCP_ENGAGE_EVENT1(so, readfds);
                 continue;
@@ -590 +587 @@
             {
                 Log2(("connecting %R[natsock] engaged\n",so));
-                STAM_REL_COUNTER_INC(&pData->StatTCPHot);
+                STAM_COUNTER_INC(&pData->StatTCPHot);
                 TCP_ENGAGE_EVENT1(so, writefds);
             }
@@ -600 +597 @@
             if (CONN_CANFSEND(so) && so->so_rcv.sb_cc)
             {
-                STAM_REL_COUNTER_INC(&pData->StatTCPHot);
+                STAM_COUNTER_INC(&pData->StatTCPHot);
                 TCP_ENGAGE_EVENT1(so, writefds);
             }
@@ -610 +607 @@
             if (CONN_CANFRCV(so) && (so->so_snd.sb_cc < (so->so_snd.sb_datalen/2)))
             {
-                STAM_REL_COUNTER_INC(&pData->StatTCPHot);
+                STAM_COUNTER_INC(&pData->StatTCPHot);
                 TCP_ENGAGE_EVENT2(so, readfds, xfds);
             }
@@ -618 +615 @@
          * UDP sockets
          */
-        STAM_REL_COUNTER_RESET(&pData->StatUDP);
-        STAM_REL_COUNTER_RESET(&pData->StatUDPHot);
+        STAM_COUNTER_RESET(&pData->StatUDP);
+        STAM_COUNTER_RESET(&pData->StatUDPHot);
 
         for (so = udb.so_next; so != &udb; so = so_next)
@@ -625 +622 @@
             so_next = so->so_next;
 
-            STAM_REL_COUNTER_INC(&pData->StatUDP);
+            STAM_COUNTER_INC(&pData->StatUDP);
 
             /*
@@ -653 +650 @@
             if ((so->so_state & SS_ISFCONNECTED) && so->so_queued <= 4)
             {
-                STAM_REL_COUNTER_INC(&pData->StatUDPHot);
+                STAM_COUNTER_INC(&pData->StatUDPHot);
                 UDP_ENGAGE_EVENT(so, readfds);
             }
@@ -666 +663 @@
 #endif
 
-    STAM_REL_PROFILE_STOP(&pData->StatFill, a);
+    STAM_PROFILE_STOP(&pData->StatFill, a);
 }
 
@@ -683 +680 @@
 #endif
 
-    STAM_REL_PROFILE_START(&pData->StatPoll, a);
+    STAM_PROFILE_START(&pData->StatPoll, a);
 
     /* Update time */
@@ -695 +692 @@
         if (time_fasttimo && ((curtime - time_fasttimo) >= 2))
         {
-            STAM_REL_PROFILE_START(&pData->StatFastTimer, a);
+            STAM_PROFILE_START(&pData->StatFastTimer, a);
             tcp_fasttimo(pData);
             time_fasttimo = 0;
-            STAM_REL_PROFILE_STOP(&pData->StatFastTimer, a);
+            STAM_PROFILE_STOP(&pData->StatFastTimer, a);
         }
         if (do_slowtimo && ((curtime - last_slowtimo) >= 499))
         {
-            STAM_REL_PROFILE_START(&pData->StatSlowTimer, a);
+            STAM_PROFILE_START(&pData->StatSlowTimer, a);
             ip_slowtimo(pData);
             tcp_slowtimo(pData);
             last_slowtimo = curtime;
-            STAM_REL_PROFILE_STOP(&pData->StatSlowTimer, a);
+            STAM_PROFILE_STOP(&pData->StatSlowTimer, a);
         }
     }
@@ -932 +929 @@
         if_start(pData);
 
-    STAM_REL_PROFILE_STOP(&pData->StatPoll, a);
+    STAM_PROFILE_STOP(&pData->StatPoll, a);
 }
 
@@ -1067 +1064 @@
     
     m = m_get(pData);
-    if (m == NULL)
+    if (!m)
+    {
         LogRel(("can't allocate new mbuf\n"));
+        return;
+    }
 
     /* Note: we add to align the IP header */