Changeset 14196 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 14, 2008 7:30:48 AM (16 years ago)

Author:

vboxsync

Message:

NAT: Linux build fix; added some perfcounters

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (9 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (17 diffs)
• slirp/slirp_state.h (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -179 +179 @@
 {
     PDRVNAT pThis = PDMINETWORKCONNECTOR_2_DRVNAT(pInterface);
+    int rc;
 
     LogFlow(("drvNATNotifyLinkChanged: enmLinkState=%d\n", enmLinkState));
@@ -184 +185 @@
     LogRel(("drvNATNotifyLinkChanged\n"));
 #ifndef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
-    int rc = RTCritSectEnter(&pThis->CritSect);
+    rc = RTCritSectEnter(&pThis->CritSect);
     AssertReleaseRC(rc);
 #endif
@@ -196 +197 @@
 #ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
 # ifndef RT_OS_WINDOWS
-            int rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
+            rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
             AssertRC(rc);
 # else
@@ -210 +211 @@
 #ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
 # ifndef RT_OS_WINDOWS
-            int rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
+            rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
             AssertRC(rc);
 # else
@@ -267 +268 @@
     HANDLE  *phEvents;
 # endif
-    const struct timeval TimeWait   = { 0, 2000 }; /* 2ms for the fast timer */
-    const struct timeval TimeNoWait = { 0,    0 }; /* return immediately */
 
     LogFlow(("drvNATAsyncIoThread: pThis=%p\n", pThis));
@@ -284 +283 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        bool fWait = true;
 
         FD_ZERO(&ReadFDs);
@@ -296 +294 @@
         slirp_select_fill(pThis->pNATState, &nFDs, &ReadFDs, &WriteFDs, &XcptFDs);
 # ifndef RT_OS_WINDOWS
-        struct timeval tv = fWait ? TimeWait : TimeNoWait;
-        FD_SET(pThis->PipeRead, &ReadFDs); /* Linux only */
+        struct timeval tv = { 0, 2000 }; /* 2ms */
+        FD_SET(pThis->PipeRead, &ReadFDs);
         nFDs = ((int)pThis->PipeRead < nFDs ? nFDs : pThis->PipeRead);
         int cChangedFDs = select(nFDs + 1, &ReadFDs, &WriteFDs, &XcptFDs, &tv);
@@ -315 +313 @@
                         slirp_input(pThis->pNATState, (uint8_t *)pThis->cBuffer, pThis->sBufferSize);
                         RTSemEventSignal(pThis->semSndMutex);
-                        fWait = 1;
                         break;
                     case '2':
@@ -697 +694 @@
     if (RT_SUCCESS(rc))
     {
+        slirp_register_timers(pThis->pNATState, pDrvIns);
         int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfgHandle, Network);
         if (RT_SUCCESS(rc2))

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

@@ -28 +28 @@
 
 int slirp_init(PNATState *, const char *, uint32_t, bool, const char *, const char *, void *);
+void slirp_register_timers(PNATState pData, PPDMDRVINS pDrvIns);
 void slirp_term(PNATState);
 void slirp_link_up(PNATState);

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

@@ -4 +4 @@
 #endif
 
+/* disable these counters for the final release */
+/* #define VBOX_WITHOUT_RELEASE_STATISTICS */
+
 #include <VBox/err.h>
+#include <VBox/stam.h>
+#include <VBox/pdmdrv.h>
 #include <iprt/assert.h>
 
@@ -250 +255 @@
 
 /**
+ * Statistics counters.
+ */
+void slirp_register_timers(PNATState pData, PPDMDRVINS pDrvIns)
+{
+#ifndef VBOX_WITHOUT_RELEASE_STATISTICS
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatFill, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
+                           STAMUNIT_TICKS_PER_CALL, "Profiling slirp fills", "/Drivers/NAT%d/Fill", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatPoll, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
+                           STAMUNIT_TICKS_PER_CALL, "Profiling slirp polls", "/Drivers/NAT%d/Poll", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatFastTimer, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
+                           STAMUNIT_TICKS_PER_CALL, "Profiling slirp fast timer", "/Drivers/NAT%d/TimerFast", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatSlowTimer, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
+                           STAMUNIT_TICKS_PER_CALL, "Profiling slirp slow timer", "/Drivers/NAT%d/TimerSlow", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatTCP, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
+                           STAMUNIT_COUNT, "TCP sockets", "/Drivers/NAT%d/SockTCP", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatTCPHot, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
+                           STAMUNIT_COUNT, "TCP sockets active", "/Drivers/NAT%d/SockTCPHot", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatUDP, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
+                           STAMUNIT_COUNT, "UDP sockets", "/Drivers/NAT%d/SockUDP", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pData->StatTCPHot, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
+                           STAMUNIT_COUNT, "UDP sockets active", "/Drivers/NAT%d/SockUDPHot", pDrvIns->iInstance);
+#endif /* VBOX_WITHOUT_RELEASE_STATISTICS */
+}
+
+/**
  * Marks the link as up, making it possible to establish new connections.
  */
@@ -358 +388 @@
 #endif
 
+    STAM_REL_PROFILE_START(&pData->StatFill, a);
+
     nfds = *pnfds;
         /*
@@ -371 +403 @@
                                ((struct ipasfrag *)&ipq != u32_to_ptr(pData, ipq.next, struct ipasfrag *)));
 
+                STAM_REL_COUNTER_RESET(&pData->StatTCP);
+                STAM_REL_COUNTER_RESET(&pData->StatTCPHot);
+
                 for (so = tcb.so_next; so != &tcb; so = so_next) {
                         so_next = so->so_next;
+
+                        STAM_REL_COUNTER_INC(&pData->StatTCP);
 
                         /*
@@ -391 +428 @@
                          */
                         if (so->so_state & SS_FACCEPTCONN) {
+                                STAM_REL_COUNTER_INC(&pData->StatTCPHot);
 #if !defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
                                 FD_SET(so->s, readfds);
@@ -410 +448 @@
                          */
                         if (so->so_state & SS_ISFCONNECTING) {
+                                STAM_REL_COUNTER_INC(&pData->StatTCPHot);
 #if !defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
                                 FD_SET(so->s, writefds);
@@ -426 +465 @@
                          */
                         if (CONN_CANFSEND(so) && so->so_rcv.sb_cc) {
+                                STAM_REL_COUNTER_INC(&pData->StatTCPHot);
 #if !defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
                                 FD_SET(so->s, writefds);
@@ -442 +482 @@
                          */
                         if (CONN_CANFRCV(so) && (so->so_snd.sb_cc < (so->so_snd.sb_datalen/2))) {
+                                STAM_REL_COUNTER_INC(&pData->StatTCPHot);
 #if !defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
                                 FD_SET(so->s, readfds);
@@ -463 +504 @@
                  * UDP sockets
                  */
+                STAM_REL_COUNTER_RESET(&pData->StatUDP);
+                STAM_REL_COUNTER_RESET(&pData->StatUDPHot);
+
                 for (so = udb.so_next; so != &udb; so = so_next) {
                         so_next = so->so_next;
+
+                        STAM_REL_COUNTER_INC(&pData->StatUDP);
 
                         /*
@@ -488 +534 @@
                          */
                         if ((so->so_state & SS_ISFCONNECTED) && so->so_queued <= 4) {
+                                STAM_REL_COUNTER_INC(&pData->StatUDPHot);
 #if !defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
                                 FD_SET(so->s, readfds);
@@ -497 +544 @@
                                 continue;
 #endif
+                                STAM_REL_COUNTER_INC(&pData->StatUDPHot);
                         }
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
@@ -547 +595 @@
         *pnfds = VBOX_EVENT_COUNT;
 #endif
+
+    STAM_REL_PROFILE_STOP(&pData->StatFill, a);
 }
 
@@ -559 +609 @@
         int timer_update = (readfds == NULL && writefds == NULL && xfds == NULL);
 #endif
+        STAM_REL_PROFILE_START(&pData->StatPoll, a);
 
         /* Update time */
@@ -568 +619 @@
         if (link_up) {
                 if (time_fasttimo && ((curtime - time_fasttimo) >= 2)) {
+                        STAM_REL_PROFILE_START(&pData->StatFastTimer, a);
                         tcp_fasttimo(pData);
                         time_fasttimo = 0;
+                        STAM_REL_PROFILE_STOP(&pData->StatFastTimer, a);
                 }
                 if (do_slowtimo && ((curtime - last_slowtimo) >= 499)) {
+                        STAM_REL_PROFILE_START(&pData->StatSlowTimer, a);
                         ip_slowtimo(pData);
                         tcp_slowtimo(pData);
                         last_slowtimo = curtime;
+                        STAM_REL_PROFILE_STOP(&pData->StatSlowTimer, a);
                 }
         }
@@ -598 +653 @@
                            continue;
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                        rc = WSAEnumNetworkEvents(so->s, VBOX_SOCKET_EVENT, &NetworkEvents);    
+                        rc = WSAEnumNetworkEvents(so->s, so->hNetworkEvent, &NetworkEvents);
                         if (rc == SOCKET_ERROR)
                         {
@@ -615 +670 @@
                         if (FD_ISSET(so->s, xfds))
 #else
+                        /* out-of-band data */
                         if ((NetworkEvents.lNetworkEvents & FD_OOB) && NetworkEvents.iErrorCode[FD_OOB_BIT] == 0)
 #endif
@@ -761 +817 @@
         if (if_queued && link_up)
            if_start(pData);
+
+        STAM_REL_PROFILE_STOP(&pData->StatPoll, a);
 }
 

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

@@ -21 +21 @@
 #ifndef _slirp_state_h_
 #define _slirp_state_h_
+
+#include <VBox/stam.h>
 
 /** Number of DHCP clients supported by NAT. */
@@ -121 +123 @@
     HANDLE phEvents[VBOX_EVENT_COUNT];
 #endif
+    STAMPROFILE StatFill;
+    STAMPROFILE StatPoll;
+    STAMPROFILE StatFastTimer;
+    STAMPROFILE StatSlowTimer;
+    STAMCOUNTER StatTCP;
+    STAMCOUNTER StatUDP;
+    STAMCOUNTER StatTCPHot;
+    STAMCOUNTER StatUDPHot;
 } NATState;