Changeset 27896 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 31, 2010 1:33:57 PM (15 years ago)

Author:

vboxsync

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

59584

Message:

Metrics updates

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (2 diffs)
• VMMDevInterface.cpp (modified) (2 diffs)
• include/GuestImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -88 +88 @@
 
     mStatUpdateInterval = 0;                    /* Default is not to report guest statistics at all */
+
+    /* Clear statistics. */
+    for (unsigned i = 0 ; i < GUESTSTATTYPE_MAX; i++)
+        mCurrentGuestStat[i] = 0;
+
     return S_OK;
 }
@@ -251 +256 @@
                                           ULONG *aPageTotal, ULONG *aPageFree)
 {
-    return S_OK;
-}
-
+    CheckComArgOutPointerValid(aCpuUser);
+    CheckComArgOutPointerValid(aCpuKernel);
+    CheckComArgOutPointerValid(aCpuIdle);
+    CheckComArgOutPointerValid(aMemTotal);
+    CheckComArgOutPointerValid(aMemFree);
+    CheckComArgOutPointerValid(aMemBalloon);
+    CheckComArgOutPointerValid(aMemCache);
+    CheckComArgOutPointerValid(aPageTotal);
+    CheckComArgOutPointerValid(aPageFree);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aCpuUser = mCurrentGuestStat[GUESTSTATTYPE_CPUUSER];
+    *aCpuKernel = mCurrentGuestStat[GUESTSTATTYPE_CPUKERNEL];
+    *aCpuIdle = mCurrentGuestStat[GUESTSTATTYPE_CPUIDLE];
+    *aMemTotal = mCurrentGuestStat[GUESTSTATTYPE_MEMTOTAL];
+    *aMemFree = mCurrentGuestStat[GUESTSTATTYPE_MEMFREE];
+    *aMemBalloon = mCurrentGuestStat[GUESTSTATTYPE_MEMBALLOON];
+    *aMemCache = mCurrentGuestStat[GUESTSTATTYPE_MEMCACHE];
+    *aPageTotal = mCurrentGuestStat[GUESTSTATTYPE_PAGETOTAL];
+    *aPageFree = mCurrentGuestStat[GUESTSTATTYPE_PAGEFREE];
+
+    return S_OK;
+}
+
+HRESULT Guest::SetStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (enmType > GUESTSTATTYPE_MAX)
+        return E_INVALIDARG;
+
+    mCurrentGuestStat[enmType] = aVal;
+    return S_OK;
+}
 
 STDMETHODIMP Guest::SetCredentials(IN_BSTR aUserName, IN_BSTR aPassword,

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -458 +458 @@
         return VERR_INVALID_PARAMETER; /** @todo wrong error */
 
-#if 0
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_IDLE)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_CPULoad_Idle, pGuestStats->u32CpuLoad_Idle);
+        guest->SetStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUIDLE, pGuestStats->u32CpuLoad_Idle);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_KERNEL)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_CPULoad_Kernel, pGuestStats->u32CpuLoad_Kernel);
+        guest->SetStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUKERNEL, pGuestStats->u32CpuLoad_Kernel);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_USER)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_CPULoad_User, pGuestStats->u32CpuLoad_User);
-
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_THREADS)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_Threads, pGuestStats->u32Threads);
-
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PROCESSES)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_Processes, pGuestStats->u32Processes);
-
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_HANDLES)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_Handles, pGuestStats->u32Handles);
-
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_MEMORY_LOAD)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_MemoryLoad, pGuestStats->u32MemoryLoad);
+        guest->SetStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUUSER, pGuestStats->u32CpuLoad_User);
+
 
     /* Note that reported values are in pages; upper layers expect them in megabytes */
@@ -486 +474 @@
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_TOTAL)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PhysMemTotal, (pGuestStats->u32PhysMemTotal + (_1M/pGuestStats->u32PageSize)-1) / (_1M/pGuestStats->u32PageSize));
+        guest->SetStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMTOTAL, (pGuestStats->u32PhysMemTotal + (_1M/pGuestStats->u32PageSize)-1) / (_1M/pGuestStats->u32PageSize));
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_AVAIL)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PhysMemAvailable, pGuestStats->u32PhysMemAvail / (_1M/pGuestStats->u32PageSize));
+        guest->SetStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMFREE, pGuestStats->u32PhysMemAvail / (_1M/pGuestStats->u32PageSize));
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_BALLOON)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PhysMemBalloon, pGuestStats->u32PhysMemBalloon / (_1M/pGuestStats->u32PageSize));
-
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_MEM_COMMIT_TOTAL)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_MemCommitTotal, pGuestStats->u32MemCommitTotal / (_1M/pGuestStats->u32PageSize));
-
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_MEM_KERNEL_TOTAL)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_MemKernelTotal, pGuestStats->u32MemKernelTotal / (_1M/pGuestStats->u32PageSize));
-
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_MEM_KERNEL_PAGED)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_MemKernelPaged, pGuestStats->u32MemKernelPaged / (_1M/pGuestStats->u32PageSize));
-
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_MEM_KERNEL_NONPAGED)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_MemKernelNonpaged, pGuestStats->u32MemKernelNonPaged / (_1M/pGuestStats->u32PageSize));
+        guest->SetStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMBALLOON, pGuestStats->u32PhysMemBalloon / (_1M/pGuestStats->u32PageSize));
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_MEM_SYSTEM_CACHE)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_MemSystemCache, pGuestStats->u32MemSystemCache / (_1M/pGuestStats->u32PageSize));
+        guest->SetStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMCACHE, pGuestStats->u32MemSystemCache / (_1M/pGuestStats->u32PageSize));
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PAGE_FILE_SIZE)
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PageFileSize, pGuestStats->u32PageFileSize / (_1M/pGuestStats->u32PageSize));
-
-    /* increase sample number */
-    ULONG sample;
-
-    int rc = guest->GetStatistic(0, GuestStatisticType_SampleNumber, &sample);
-    if (SUCCEEDED(rc))
-        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_SampleNumber, sample+1);
-#endif
+        guest->SetStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_PAGETOTAL, pGuestStats->u32PageFileSize / (_1M/pGuestStats->u32PageSize));
+
     return VINF_SUCCESS;
 }

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

@@ -25 +25 @@
 #include "VirtualBoxBase.h"
 #include <VBox/ostypes.h>
+
+typedef enum
+{
+    GUESTSTATTYPE_CPUUSER     = 0,
+    GUESTSTATTYPE_CPUKERNEL   = 1,
+    GUESTSTATTYPE_CPUIDLE     = 2,
+    GUESTSTATTYPE_MEMTOTAL    = 3,
+    GUESTSTATTYPE_MEMFREE     = 4,
+    GUESTSTATTYPE_MEMBALLOON  = 5,
+    GUESTSTATTYPE_MEMCACHE    = 6,
+    GUESTSTATTYPE_PAGETOTAL   = 7,
+    GUESTSTATTYPE_PAGEFREE    = 8,
+    GUESTSTATTYPE_MAX         = 8
+} GUESTSTATTYPE;
 
 class Console;
@@ -85 +99 @@
     void setSupportsGraphics (BOOL aSupportsGraphics);
 
+    HRESULT SetStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal);
+
     // for VirtualBoxSupportErrorInfoImpl
     static const wchar_t *getComponentName() { return L"Guest"; }
@@ -112 +128 @@
     ULONG mMemoryBalloonSize;
     ULONG mStatUpdateInterval;
+    ULONG mCurrentGuestStat[GUESTSTATTYPE_MAX];
 
     Console *mParent;