Changeset 43908 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 19, 2012 5:36:43 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82169

Message:

Main/Metrics: VM network rate metrics (#6345)

File:

• trunk/src/VBox/Main/src-client/GuestImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/GuestImpl.cpp

@@ -33 +33 @@
 #include <VBox/VMMDev.h>
 #include <iprt/cpp/utils.h>
+#include <iprt/ctype.h>
+#include <iprt/stream.h>
 #include <iprt/timer.h>
 #include <VBox/vmm/pgm.h>
@@ -95 +97 @@
 
     /* Clear statistics. */
+    mNetStatRx = mNetStatTx = 0;
+    mNetStatLastTs = RTTimeNanoTS();
     for (unsigned i = 0 ; i < GUESTSTATTYPE_MAX; i++)
         mCurrentGuestStat[i] = 0;
-    mGuestValidStats = pm::GUESTSTATMASK_NONE;
+    mVmValidStats = pm::VMSTATMASK_NONE;
 
     mMagic = GUEST_MAGIC;
@@ -180 +184 @@
 }
 
+/* static */
+int Guest::staticEnumStatsCallback(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
+                                          STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser)
+{
+    PSTAMCOUNTER pCnt = (PSTAMCOUNTER)pvSample;
+    char *pszEnd = strrchr((char*)pszName, '/');
+    if (pszEnd)
+    {
+        bool    fRx;
+        uint8_t uInstance = 0;
+
+        switch (pszEnd[1])
+        {
+            case 'R':
+                fRx = true;
+                break;
+            case 'T':
+                fRx = false;
+                break;
+            default:
+                LogRel(("Failed to parse the name of network stat counter (unknown counter): %s\n", pszName));
+                return VINF_SUCCESS;
+        }
+        do
+            --pszEnd;
+        while (pszEnd > pszName && RT_C_IS_DIGIT(*pszEnd));
+        if (RT_SUCCESS(RTStrToUInt8Ex(pszEnd + 1, NULL, 10, &uInstance)))
+        {
+            Guest *pGuest = (Guest *)pvUser;
+            LogFlowFunc(("%s i=%u d=%s %llu %s\n", pszName, uInstance, fRx ? "RX" : "TX",
+                         pCnt->c, STAMR3GetUnit(enmUnit)));
+            if (fRx)
+                pGuest->mNetStatRx += pCnt->c;
+            else
+                pGuest->mNetStatTx += pCnt->c;
+        }
+        else
+            LogRel(("Failed to extract the device instance from the name of network stat counter: %s\n", pszEnd));
+    }
+    else
+        LogRel(("Failed to parse the name of network stat counter (no slash): %s\n", pszName));
+
+    return VINF_SUCCESS;
+}
+
 void Guest::updateStats(uint64_t iTick)
 {
@@ -187 +236 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    ULONG uNetStatRx = 0;
+    ULONG uNetStatTx = 0;
     ULONG aGuestStats[GUESTSTATTYPE_MAX];
     RT_ZERO(aGuestStats);
-    ULONG validStats = mGuestValidStats;
+    ULONG validStats = mVmValidStats;
     /* Check if we have anything to report */
     if (validStats)
     {
-        mGuestValidStats = pm::GUESTSTATMASK_NONE;
+        mVmValidStats = pm::VMSTATMASK_NONE;
         memcpy(aGuestStats, mCurrentGuestStat, sizeof(aGuestStats));
     }
@@ -226 +277 @@
             if (rc == VINF_SUCCESS)
             {
-                validStats |= pm::GUESTSTATMASK_MEMSHARED;
+                validStats |= pm::VMSTATMASK_GUEST_MEMSHARED;
             }
         }
@@ -236 +287 @@
             if (rc == VINF_SUCCESS)
             {
-                validStats |= pm::GUESTSTATMASK_ALLOCVMM|pm::GUESTSTATMASK_FREEVMM|
-                    pm::GUESTSTATMASK_BALOONVMM|pm::GUESTSTATMASK_SHAREDVMM;
+                validStats |=
+                    pm::VMSTATMASK_VMM_ALLOC  | pm::VMSTATMASK_VMM_FREE |
+                    pm::VMSTATMASK_VMM_BALOON | pm::VMSTATMASK_VMM_SHARED;
             }
         }
 
-    }
-
-    mParent->reportGuestStatistics(validStats,
-                                   aGuestStats[GUESTSTATTYPE_CPUUSER],
-                                   aGuestStats[GUESTSTATTYPE_CPUKERNEL],
-                                   aGuestStats[GUESTSTATTYPE_CPUIDLE],
-                                   /* Convert the units for RAM usage stats: page (4K) -> 1KB units */
-                                   mCurrentGuestStat[GUESTSTATTYPE_MEMTOTAL] * (_4K/_1K),
-                                   mCurrentGuestStat[GUESTSTATTYPE_MEMFREE] * (_4K/_1K),
-                                   mCurrentGuestStat[GUESTSTATTYPE_MEMBALLOON] * (_4K/_1K),
-                                   (ULONG)(uSharedMem / _1K), /* bytes -> KB */
-                                   mCurrentGuestStat[GUESTSTATTYPE_MEMCACHE] * (_4K/_1K),
-                                   mCurrentGuestStat[GUESTSTATTYPE_PAGETOTAL] * (_4K/_1K),
-                                   (ULONG)(uAllocTotal / _1K), /* bytes -> KB */
-                                   (ULONG)(uFreeTotal / _1K),
-                                   (ULONG)(uBalloonedTotal / _1K),
-                                   (ULONG)(uSharedTotal / _1K));
+        uint64_t uRxPrev = mNetStatRx;
+        uint64_t uTxPrev = mNetStatTx;
+        mNetStatRx = mNetStatTx = 0;
+        rc = STAMR3Enum(pVM, "*/ReceiveBytes|*/TransmitBytes", staticEnumStatsCallback, this);
+        uint64_t uTsNow = RTTimeNanoTS();
+        uint64_t uTimePassed = uTsNow - mNetStatLastTs;
+        mNetStatLastTs = uTsNow;
+        uNetStatRx = (ULONG)((mNetStatRx - uRxPrev) * 1000000 / (uTimePassed / 1000)); /* in bytes per second */
+        uNetStatTx = (ULONG)((mNetStatTx - uTxPrev) * 1000000 / (uTimePassed / 1000)); /* in bytes per second */
+        LogFlowThisFunc(("Net Rx=%llu Tx=%llu Ts=%llu Delta=%llu\n", mNetStatRx, mNetStatTx, uTsNow, uTimePassed));
+        AssertRC(rc);
+        validStats |= pm::VMSTATMASK_NET_RX | pm::VMSTATMASK_NET_TX;
+    }
+
+    mParent->reportVmStatistics(validStats,
+                                aGuestStats[GUESTSTATTYPE_CPUUSER],
+                                aGuestStats[GUESTSTATTYPE_CPUKERNEL],
+                                aGuestStats[GUESTSTATTYPE_CPUIDLE],
+                                /* Convert the units for RAM usage stats: page (4K) -> 1KB units */
+                                mCurrentGuestStat[GUESTSTATTYPE_MEMTOTAL] * (_4K/_1K),
+                                mCurrentGuestStat[GUESTSTATTYPE_MEMFREE] * (_4K/_1K),
+                                mCurrentGuestStat[GUESTSTATTYPE_MEMBALLOON] * (_4K/_1K),
+                                (ULONG)(uSharedMem / _1K), /* bytes -> KB */
+                                mCurrentGuestStat[GUESTSTATTYPE_MEMCACHE] * (_4K/_1K),
+                                mCurrentGuestStat[GUESTSTATTYPE_PAGETOTAL] * (_4K/_1K),
+                                (ULONG)(uAllocTotal / _1K), /* bytes -> KB */
+                                (ULONG)(uFreeTotal / _1K),
+                                (ULONG)(uBalloonedTotal / _1K),
+                                (ULONG)(uSharedTotal / _1K),
+                                uNetStatRx,
+                                uNetStatTx);
 }
 
@@ -620 +686 @@
     static ULONG indexToPerfMask[] =
     {
-        pm::GUESTSTATMASK_CPUUSER,
-        pm::GUESTSTATMASK_CPUKERNEL,
-        pm::GUESTSTATMASK_CPUIDLE,
-        pm::GUESTSTATMASK_MEMTOTAL,
-        pm::GUESTSTATMASK_MEMFREE,
-        pm::GUESTSTATMASK_MEMBALLOON,
-        pm::GUESTSTATMASK_MEMCACHE,
-        pm::GUESTSTATMASK_PAGETOTAL,
-        pm::GUESTSTATMASK_NONE
+        pm::VMSTATMASK_GUEST_CPUUSER,
+        pm::VMSTATMASK_GUEST_CPUKERNEL,
+        pm::VMSTATMASK_GUEST_CPUIDLE,
+        pm::VMSTATMASK_GUEST_MEMTOTAL,
+        pm::VMSTATMASK_GUEST_MEMFREE,
+        pm::VMSTATMASK_GUEST_MEMBALLOON,
+        pm::VMSTATMASK_GUEST_MEMCACHE,
+        pm::VMSTATMASK_GUEST_PAGETOTAL,
+        pm::VMSTATMASK_NONE
     };
     AutoCaller autoCaller(this);
@@ -639 +705 @@
 
     mCurrentGuestStat[enmType] = aVal;
-    mGuestValidStats |= indexToPerfMask[enmType];
+    mVmValidStats |= indexToPerfMask[enmType];
     return S_OK;
 }