Changeset 20453 in vbox for trunk/src/VBox

Timestamp:

Jun 10, 2009 1:41:54 AM (16 years ago)

Author:

vboxsync

Message:

NAT: adds performance counters to sbuf and tcp_input

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• counters.h (modified) (2 diffs)
• sbuf.c (modified) (3 diffs)
• tcp_input.c (modified) (14 diffs)

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

@@ -52 +52 @@
 COUNTING_COUTER(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_COUTER(IOSBAppend, "SB: Append total");
 COUNTING_COUTER(IOSBAppend_wa, "SB: Append all is written to network ");
@@ -62 +66 @@
 COUNTING_COUTER(IOSBAppendSB_w_ge_r, "SB: AppendSB (sb_wptr >= sb_rptr)");
 COUNTING_COUTER(IOSBAppendSB_w_alter, "SB: AppendSB (altering of sb_wptr)");
+
+PROFILE_COUNTER(TCP_reassamble, "TCP::reasamble");
+PROFILE_COUNTER(TCP_input, "TCP::input");

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

@@ -78 +78 @@
     int ret = 0;
 
+    SLIRP_PROFILE_START(IOSBAppend_pf, a);
     DEBUG_CALL("sbappend");
     DEBUG_ARG("so = %lx", (long)so);
@@ -127 +128 @@
          */
         sbappendsb(pData, &so->so_rcv, m);
+        SLIRP_PROFILE_STOP(IOSBAppend_pf_wf, a);
         goto done;
     }
@@ -139 +141 @@
         m->m_data += ret;
         sbappendsb(pData, &so->so_rcv, m);
+        SLIRP_PROFILE_STOP(IOSBAppend_pf_wp, a);
         goto done;
     } /* else */
     /* Whatever happened, we free the mbuf */
     SLIRP_COUNTER_INC(IOSBAppend_wa);
+    SLIRP_PROFILE_STOP(IOSBAppend_pf_wa, a);
 done:
     m_free(pData, m);

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);
 
     /*
@@ -108 +109 @@
         m_freem(pData, m);
         *tlenp = 0;
+        SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
         return (0);
     }
@@ -121 +123 @@
         m_freem(pData, m);
         *tlenp = 0;
+        SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
         return (0);
     }
@@ -218 +221 @@
      */
     if (!TCPS_HAVEESTABLISHED(tp->t_state))
+    {
+        SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
         return (0);
+    }
     q = LIST_FIRST(&tp->t_segq);
     if (!q || q->tqe_th->th_seq != tp->rcv_nxt)
+    {
+        SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
         return (0);
+    }
     do
     {
@@ -250 +259 @@
     while (q && q->tqe_th->th_seq == tp->rcv_nxt);
 
+    SLIRP_PROFILE_STOP(TCP_reassamble, tcp_reassamble);
     return flags;
 }
@@ -273 +283 @@
     u_long tiwin;
 /*  int ts_present = 0; */
+    SLIRP_PROFILE_START(TCP_input, counter_input);
 
     DEBUG_CALL("tcp_input");
@@ -303 +314 @@
                         /* mbuf should be cleared in sofree called from tcp_close */
                         tcp_close(pData, tp);
+                        SLIRP_PROFILE_STOP(TCP_input, counter_input);
                         return;
                 }
@@ -637 +649 @@
 
               SOCKET_UNLOCK(so);
+              SLIRP_PROFILE_STOP(TCP_input, counter_input);
               return;
             }
@@ -682 +695 @@
             tcp_output(pData, tp);
             SOCKET_UNLOCK(so);
+            SLIRP_PROFILE_STOP(TCP_input, counter_input);
             return;
         }
@@ -781 +795 @@
             }
             SOCKET_UNLOCK(so);
+            SLIRP_PROFILE_STOP(TCP_input, counter_input);
             return;
 
@@ -1607 +1622 @@
 
     SOCKET_UNLOCK(so);
+    SLIRP_PROFILE_STOP(TCP_input, counter_input);
     return;
 
@@ -1621 +1637 @@
     (void) tcp_output(pData, tp);
     SOCKET_UNLOCK(so);
+    SLIRP_PROFILE_STOP(TCP_input, counter_input);
     return;
 
@@ -1636 +1653 @@
     if (so != &tcb)
         SOCKET_UNLOCK(so);
+    SLIRP_PROFILE_STOP(TCP_input, counter_input);
     return;
 
@@ -1651 +1669 @@
 #endif
 
+    SLIRP_PROFILE_STOP(TCP_input, counter_input);
     return;
 }