Changeset 20378 in vbox

Timestamp:

Jun 8, 2009 4:50:33 AM (16 years ago)

Author:

vboxsync

Message:

NAT: socket perfmance counters

File:

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

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

@@ -13 +13 @@
 #include <sys/filio.h>
 #endif
+#include <VBox/pdmdrv.h>
 #if defined (RT_OS_WINDOWS)
 #include <iphlpapi.h>
@@ -123 +124 @@
     struct iovec iov[2];
     int mss = so->so_tcpcb->t_maxseg;
+
+    SLIRP_PROFILE_START(IOread, a);
+    SLIRP_COUNTER_RESET(IORead_in_1);
+    SLIRP_COUNTER_RESET(IORead_in_2);
+
     QSOCKET_LOCK(tcb);
     SOCKET_LOCK(so);
@@ -214 +220 @@
         {
             SOCKET_UNLOCK(so);
+            SLIRP_PROFILE_STOP(IOread, a);
             return 0;
         }
@@ -220 +227 @@
         {
             SOCKET_UNLOCK(so);
+            STAM_PROFILE_STOP(&pData->StatIOread, a);
             return 0;
         }
@@ -230 +238 @@
             tcp_sockclosed(pData, sototcpcb(so));
             SOCKET_UNLOCK(so);
+            STAM_PROFILE_STOP(&pData->StatIOread, a);
             return -1;
         }
     }
+    STAM_STATS(
+        if (n == 1)
+        { 
+            STAM_COUNTER_INC(&pData->StatIORead_in_1);
+            STAM_COUNTER_ADD(&pData->StatIORead_in_1_bytes, nn);
+        }
+        else
+        {
+            STAM_COUNTER_INC(&pData->StatIORead_in_2);
+            STAM_COUNTER_ADD(&pData->StatIORead_in_2_1st_bytes, nn);
+        }
+    );
 
 #ifndef HAVE_READV
@@ -250 +271 @@
         if (ret > 0)
             nn += ret;
+        STAM_STATS(
+            if(ret > 0)
+            {
+                SLIRP_COUNTER_INC(IORead_in_2);
+                SLIRP_COUNTER_ADD(IORead_in_2_2nd_bytes, ret);
+            }
+        );
     }
 
@@ -260 +288 @@
     if (sb->sb_wptr >= (sb->sb_data + sb->sb_datalen))
         sb->sb_wptr -= sb->sb_datalen;
+    STAM_PROFILE_STOP(&pData->StatIOread, a);
     SOCKET_UNLOCK(so);
     return nn;
@@ -372 +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);
     DEBUG_CALL("sowrite");
     DEBUG_ARG("so = %lx", (long)so);
@@ -383 +421 @@
         {
             SOCKET_UNLOCK(so);
+            STAM_PROFILE_STOP(&pData->StatIOwrite, a);
             return 0;
         }
@@ -422 +461 @@
             n = 1;
     }
+    STAM_STATS({
+        if (n == 1) 
+        {
+            SLIRP_COUNTER_INC(IOWrite_in_1);
+            SLIRP_COUNTER_ADD(IOWrite_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);
+        }
+    });
     /* Check if there's urgent data to send, and if so, send it */
 #ifdef HAVE_READV
@@ -433 +485 @@
     {
         SOCKET_UNLOCK(so);
+        STAM_PROFILE_STOP(&pData->StatIOwrite, a);
         return 0;
     }
@@ -443 +496 @@
         tcp_sockclosed(pData, sototcpcb(so));
         SOCKET_UNLOCK(so);
+        STAM_PROFILE_STOP(&pData->StatIOwrite, a);
         return -1;
     }
@@ -453 +507 @@
         if (ret > 0)
             nn += ret;
+        STAM_STATS({
+            if (ret > 0 && ret != iov[1].iov_len)
+            {
+                SLIRP_COUNTER_INC(IOWrite_rest);
+                SLIRP_COUNTER_ADD(IOWrite_rest_bytes, (ret - iov[1].iov_len));
+            }
+        });
     }
     DEBUG_MISC((dfd, "  ... wrote nn = %d bytes\n", nn));
@@ -471 +532 @@
 
     SOCKET_UNLOCK(so);
+    SLIRP_PROFILE_STOP(IOwrite, a);
     return nn;
 }