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

Timestamp:

Sep 10, 2007 8:26:51 AM (17 years ago)

Author:

vboxsync

Message:

Completed statistic query

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -80 +80 @@
         mStatUpdateInterval = 0;                    /* Default is not to report guest statistics at all */
 
+    for (int i=0;i<GuestStatisticType_MaxVal;i++)
+        mCurrentGuestStat[i] = GUEST_STAT_INVALID;
+
     return S_OK;
 }
@@ -271 +274 @@
         return E_INVALIDARG;
 
-    switch(aStatistic)
-    {
-    case GuestStatisticType_CPULoad_Idle:
-    case GuestStatisticType_CPULoad_Kernel:
-    case GuestStatisticType_CPULoad_User:
-    case GuestStatisticType_Threads:
-    case GuestStatisticType_Processes:
-    case GuestStatisticType_Handles:
-    case GuestStatisticType_MemoryLoad:
-    case GuestStatisticType_PhysMemTotal:
-    case GuestStatisticType_PhysMemAvailable:
-    case GuestStatisticType_PhysMemBalloon:
-    case GuestStatisticType_MemCommitTotal:
-    case GuestStatisticType_MemKernelTotal:
-    case GuestStatisticType_MemKernelPaged:
-    case GuestStatisticType_MemKernelNonpaged:
-    case GuestStatisticType_MemSystemCache:
-    case GuestStatisticType_PageFileSize:
-        *aStatVal = 0;
-        break;
-
-    default:
-        AssertFailed();
-        return E_INVALIDARG;
-    }
+    if (aStatistic >= GuestStatisticType_MaxVal)
+        return E_INVALIDARG;
+
+    /* not available or not yet reported? */
+    if (mCurrentGuestStat[aStatistic] == GUEST_STAT_INVALID)
+        return E_INVALIDARG;
+
+    *aStatVal = mCurrentGuestStat[aStatistic];
     return S_OK;
 }
@@ -304 +290 @@
         return E_INVALIDARG;
 
-    switch(aStatistic)
-    {
-    case GuestStatisticType_CPULoad_Idle:
-    case GuestStatisticType_CPULoad_Kernel:
-    case GuestStatisticType_CPULoad_User:
-    case GuestStatisticType_Threads:
-    case GuestStatisticType_Processes:
-    case GuestStatisticType_Handles:
-    case GuestStatisticType_MemoryLoad:
-    case GuestStatisticType_PhysMemTotal:
-    case GuestStatisticType_PhysMemAvailable:
-    case GuestStatisticType_PhysMemBalloon:
-    case GuestStatisticType_MemCommitTotal:
-    case GuestStatisticType_MemKernelTotal:
-    case GuestStatisticType_MemKernelPaged:
-    case GuestStatisticType_MemKernelNonpaged:
-    case GuestStatisticType_MemSystemCache:
-    case GuestStatisticType_PageFileSize:
-        break;
-
-    default:
-        AssertFailed();
-        return E_INVALIDARG;
-    }
+    if (aStatistic >= GuestStatisticType_MaxVal)
+        return E_INVALIDARG;
+
+    /* internal method assumes that the caller known what he's doing (no boundary checks) */
+    mCurrentGuestStat[aStatistic] = aStatVal;
     return S_OK;
 }

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

@@ -22 +22 @@
 
 class Console;
+
+#define GUEST_STAT_INVALID          (ULONG)-1
 
 class ATL_NO_VTABLE Guest :
@@ -91 +93 @@
     ULONG mStatUpdateInterval;
 
+    ULONG mCurrentGuestStat[GuestStatisticType_MaxVal];
+
     ComObjPtr <Console, ComWeakRef> mParent;
     Data mData;