Changeset 20377 in vbox for trunk/src

Timestamp:

Jun 8, 2009 4:49:01 AM (16 years ago)

Author:

vboxsync

Message:

NAT: sbuf perfomance counters

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• sbuf.c (modified) (10 diffs)
• sbuf.h (modified) (1 diff)
• tcp_input.c (modified) (23 diffs)

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

@@ -39 +39 @@
 
 void
-sbreserve(struct sbuf *sb, int size)
+sbreserve(PNATState pData, struct sbuf *sb, int size)
 {
     if (sb->sb_data)
@@ -83 +83 @@
     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);
     /* Shouldn't happen, but...  e.g. foreign host closes connection */
     if (m->m_len <= 0)
     {
-        m_free(pData, m);
-        return;
+        SLIRP_COUNTER_INC(IOSBAppend_zm);
+        goto done;
     }
 
@@ -97 +104 @@
     if (so->so_urgc)
     {
-        sbappendsb(&so->so_rcv, m);
+        sbappendsb(pData, &so->so_rcv, m);
         m_free(pData, m);
         sosendoob(so);
@@ -112 +119 @@
     if (ret <= 0)
     {
+        SLIRP_COUNTER_INC(IOSBAppend_wf);
         /*
          * Nothing was written
@@ -118 +126 @@
          * it will be detected in the normal way by soread()
          */
-        sbappendsb(&so->so_rcv, m);
+        sbappendsb(pData, &so->so_rcv, m);
+        goto done;
     }
     else if (ret != m->m_len)
     {
+        SLIRP_COUNTER_INC(IOSBAppend_wp);
         /*
          * Something was written, but not everything..
@@ -128 +138 @@
         m->m_len -= ret;
         m->m_data += ret;
-        sbappendsb(&so->so_rcv, m);
+        sbappendsb(pData, &so->so_rcv, m);
+        goto done;
     } /* else */
     /* Whatever happened, we free the mbuf */
+    SLIRP_COUNTER_INC(IOSBAppend_wa);
+done:
     m_free(pData, m);
 }
@@ -139 +152 @@
  */
 void
-sbappendsb(struct sbuf *sb, struct mbuf *m)
+sbappendsb(PNATState pData, struct sbuf *sb, struct mbuf *m)
 {
     int len, n,  nn;
@@ -145 +158 @@
     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);
     if (sb->sb_wptr < sb->sb_rptr)
     {
+        SLIRP_COUNTER_INC(IOSBAppendSB_w_l_r);
         n = sb->sb_rptr - sb->sb_wptr;
         if (n > len)
@@ -154 +174 @@
     else
     {
+        SLIRP_COUNTER_INC(IOSBAppendSB_w_ge_r);
         /* Do the right edge first */
         n = sb->sb_data + sb->sb_datalen - sb->sb_wptr;
@@ -174 +195 @@
     sb->sb_wptr += n;
     if (sb->sb_wptr >= sb->sb_data + sb->sb_datalen)
+    {
+        SLIRP_COUNTER_INC(IOSBAppendSB_w_alter);
         sb->sb_wptr -= sb->sb_datalen;
+    }
 }
 

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

@@ -25 +25 @@
 void sbfree (struct sbuf *);
 void sbdrop (struct sbuf *, int);
-void sbreserve (struct sbuf *, int);
+void sbreserve (PNATState, struct sbuf *, int);
 void sbappend (PNATState, struct socket *, struct mbuf *);
-void sbappendsb (struct sbuf *, struct mbuf *);
+void sbappendsb (PNATState, struct sbuf *, struct mbuf *);
 void sbcopy (struct sbuf *, int, int, char *);
 

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

@@ -346 +346 @@
     {
         tcpstat.tcps_rcvbadsum++;
-        Log2(("checksum is invalid => drop\n"));
         goto drop;
     }
@@ -359 +358 @@
     {
         tcpstat.tcps_rcvbadoff++;
-        Log2(("ti_off(tlen(%d)<%d<(tcphdr(%d))) is invalid =>drop\n", tlen, off, sizeof(struct tcphdr)));
         goto drop;
     }
@@ -435 +433 @@
                 && so->so_deleted != 1) 
             {
-                Log2(("lock: %s:%d We found socket %R[natsock]\n", __FUNCTION__, __LINE__, so));
                 break; /* so is locked here */
             }
@@ -441 +438 @@
         }
         if (so == &tcb) {
-            Log2(("lock: %s:%d Haven't find anything \n", __FUNCTION__, __LINE__));
             so = NULL;
         }
@@ -470 +466 @@
      * as if it was LISTENING, and continue...
      */
-    Log2(("so = %R[natsock]\n", so));
     if (so == 0)
     {
@@ -484 +479 @@
         }
         SOCKET_LOCK(so); 
-        sbreserve(&so->so_snd, tcp_sndspace);
-        sbreserve(&so->so_rcv, tcp_rcvspace);
+        sbreserve(pData, &so->so_snd, tcp_sndspace);
+        sbreserve(pData, &so->so_rcv, tcp_rcvspace);
 
 /*      tcp_last_so = so; */  /* XXX ? */
@@ -509 +504 @@
     if (so->so_state & SS_ISFCONNECTING) 
     {
-        Log2(("so_state(%x) of %R[natsock] is still connecting =>drop\n", so->so_state, so));
         goto drop;
     }
@@ -520 +514 @@
     if (tp->t_state == TCPS_CLOSED)
     {
-        Log2(("t_state(%x) is closed =>drop\n", tp->t_state));
         goto drop;
     }
@@ -724 +717 @@
         {
             if (tiflags & TH_RST) {
-                Log2(("RST(%x) is on listen =>drop\n", tiflags));
                 goto drop;
             }
@@ -731 +723 @@
             if ((tiflags & TH_SYN) == 0) 
             {
-                Log2(("SYN(%x) is off on listen =>drop\n", tiflags));
                 goto drop;
             }
@@ -819 +810 @@
             tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
             tcpstat.tcps_accepts++;
-            Log2(("hit trimthenstep6\n"));
             goto trimthenstep6;
         } /* case TCPS_LISTEN */
@@ -845 +835 @@
                 if (tiflags & TH_ACK)
                     tp = tcp_drop(pData, tp, 0); /* XXX Check t_softerror! */
-                Log2(("RST(%x) is on SYN_SENT =>drop\n", tiflags));
                 goto drop;
             }
@@ -851 +840 @@
             if ((tiflags & TH_SYN) == 0) 
             {
-                Log2(("SYN(%x) bit is off on SYN_SENT =>drop\n", tiflags));
                 goto drop;
             }
@@ -1103 +1091 @@
 /*              so->so_error = ECONNRESET; */
 close:
-                Log2(("closing...=>drop\n", tp->t_state)); 
                 tp->t_state = TCPS_CLOSED;
                 tcpstat.tcps_drops++;
@@ -1112 +1099 @@
             case TCPS_LAST_ACK:
             case TCPS_TIME_WAIT:
-                Log2(("t_state is (%x) sort of close =>drop\n", tp->t_state)); 
                 tp = tcp_close(pData, tp);
                 goto drop;
@@ -1132 +1118 @@
     if ((tiflags & TH_ACK) == 0) 
     {
-        Log2(("ACK(%x) bit is off =>drop\n", tiflags)); 
         goto drop;
     }
@@ -1174 +1159 @@
             tp->snd_wl1 = ti->ti_seq - 1;
             /* Avoid ack processing; snd_una==ti_ack  =>  dup ack */
-            Log2(("hit synrx_to_est\n"));
             goto synrx_to_est;
             /* fall into ... */
@@ -1243 +1227 @@
                         if (SEQ_GT(onxt, tp->snd_nxt))
                             tp->snd_nxt = onxt;
-                        Log2(("t_dupacks(%d) == tcprexmtthresh(%d)=>drop\n", tp->t_dupacks, tcprexmtthresh));
                         goto drop;
                     }
@@ -1250 +1233 @@
                         tp->snd_cwnd += tp->t_maxseg;
                         (void) tcp_output(pData, tp);
-                        Log2(("t_dupacks(%d) > tcprexmtthresh(%d)=>drop\n", tp->t_dupacks, tcprexmtthresh));
                         goto drop;
                     }
@@ -1259 +1241 @@
             }
 synrx_to_est:
-            Log2(("enter synrx_to_est\n"));
             /*
              * If the congestion window was inflated to account
@@ -1397 +1378 @@
                     if (ourfinisacked)
                     {
-                        Log2(("ourfinisacked=>drop\n"));
                         tp = tcp_close(pData, tp);
                         goto drop;
@@ -1488 +1468 @@
             tp->rcv_up = tp->rcv_nxt;
 dodata:
-    Log2(("do data hit!\n"));
 
     /*
@@ -1898 +1877 @@
     tp->snd_cwnd = mss;
 
-    sbreserve(&so->so_snd, tcp_sndspace+((tcp_sndspace%mss)?(mss-(tcp_sndspace%mss)):0));
-    sbreserve(&so->so_rcv, tcp_rcvspace+((tcp_rcvspace%mss)?(mss-(tcp_rcvspace%mss)):0));
+    sbreserve(pData, &so->so_snd, tcp_sndspace+((tcp_sndspace%mss)?(mss-(tcp_sndspace%mss)):0));
+    sbreserve(pData, &so->so_rcv, tcp_rcvspace+((tcp_rcvspace%mss)?(mss-(tcp_rcvspace%mss)):0));
 
     DEBUG_MISC((dfd, " returning mss = %d\n", mss));