Changeset 56470 in vbox for trunk/src/VBox

Timestamp:

Jun 17, 2015 8:50:35 AM (10 years ago)

Author:

vboxsync

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

101087

Message:

Main: when reporting the guest CPU metrics, use the average between all VCPUs

Location:

trunk/src/VBox/Main

Files:

• include/GuestImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/GuestImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/GuestImpl.h

@@ -95 +95 @@
     HRESULT i_setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal);
     BOOL i_isPageFusionEnabled();
+    void i_setCpuCount(uint32_t aCpus) { mCpus = aCpus; }
     static HRESULT i_setErrorStatic(HRESULT aResultCode, const Utf8Str &aText)
     {
@@ -209 +210 @@
     uint64_t                        mNetStatLastTs;
     ULONG                           mCurrentGuestStat[GUESTSTATTYPE_MAX];
+    ULONG                           mCurrentGuestCpuUserStat[VMM_MAX_CPU_COUNT];
+    ULONG                           mCurrentGuestCpuKernelStat[VMM_MAX_CPU_COUNT];
+    ULONG                           mCurrentGuestCpuIdleStat[VMM_MAX_CPU_COUNT];
     ULONG                           mVmValidStats;
     BOOL                            mCollectVMMStats;
     BOOL                            mfPageFusionEnabled;
+    uint32_t                        mCpus;
 
     const ComObjPtr<Console>        mParent;

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

@@ -496 +496 @@
         rc = mGuest->init(this);
         AssertComRCReturnRC(rc);
+    
+        ULONG cCpus = 1;
+        rc = mMachine->COMGETTER(CPUCount)(&cCpus);
+        mGuest->i_setCpuCount(cCpus);
 
         unconst(mKeyboard).createObject();

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

@@ -104 +104 @@
         mCurrentGuestStat[i] = 0;
     mVmValidStats = pm::VMSTATMASK_NONE;
+    RT_ZERO(mCurrentGuestCpuUserStat);
+    RT_ZERO(mCurrentGuestCpuKernelStat);
+    RT_ZERO(mCurrentGuestCpuIdleStat);
 
     mMagic = GUEST_MAGIC;
@@ -113 +116 @@
     if (SUCCEEDED(hr))
         hr = mEventSource->init();
+
+    mCpus = 1;
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
@@ -702 +707 @@
     if (enmType >= GUESTSTATTYPE_MAX)
         return E_INVALIDARG;
+
+    if (aCpuId < VMM_MAX_CPU_COUNT)
+    {
+        ULONG *paCpuStats;
+        switch (enmType)
+        {
+            case GUESTSTATTYPE_CPUUSER:   paCpuStats = mCurrentGuestCpuUserStat;   break;
+            case GUESTSTATTYPE_CPUKERNEL: paCpuStats = mCurrentGuestCpuKernelStat; break;
+            case GUESTSTATTYPE_CPUIDLE:   paCpuStats = mCurrentGuestCpuIdleStat;   break;
+            default:                      paCpuStats = NULL;                       break;
+        }
+        if (paCpuStats)
+        {
+            paCpuStats[aCpuId] = aVal;
+            aVal = 0;
+            for (uint32_t i = 0; i < mCpus && i < VMM_MAX_CPU_COUNT; i++)
+                aVal += paCpuStats[i];
+            aVal /= mCpus;
+        }
+    }
 
     mCurrentGuestStat[enmType] = aVal;
@@ -1080 +1105 @@
     /** @todo Add VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING */
 }
-