Changeset 4570 in vbox

Timestamp:

Sep 6, 2007 12:20:12 PM (17 years ago)

Author:

vboxsync

Message:

More guest statistics

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (2 diffs)
• src/VBox/Main/GuestImpl.cpp (modified) (2 diffs)
• src/VBox/Main/VMMDevInterface.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -357 +357 @@
 
 /** guest statistics values */
-#define VBOX_GUEST_STAT_CPU_LOAD            BIT(0)
-#define VBOX_GUEST_STAT_THREADS             BIT(1)
-#define VBOX_GUEST_STAT_PROCESSES           BIT(2)
-#define VBOX_GUEST_STAT_PHYS_MEM_TOTAL      BIT(3)
-#define VBOX_GUEST_STAT_PHYS_MEM_AVAIL      BIT(4)
-#define VBOX_GUEST_STAT_PHYS_MEM_BALLOON    BIT(5)
-#define VBOX_GUEST_STAT_PAGE_FILE_SIZE      BIT(6)
+#define VBOX_GUEST_STAT_CPU_LOAD_IDLE       BIT(0)
+#define VBOX_GUEST_STAT_CPU_LOAD_KERNEL     BIT(1)
+#define VBOX_GUEST_STAT_CPU_LOAD_USER       BIT(2)
+#define VBOX_GUEST_STAT_THREADS             BIT(3)
+#define VBOX_GUEST_STAT_PROCESSES           BIT(4)
+#define VBOX_GUEST_STAT_PHYS_MEM_TOTAL      BIT(5)
+#define VBOX_GUEST_STAT_PHYS_MEM_AVAIL      BIT(6)
+#define VBOX_GUEST_STAT_PHYS_MEM_BALLOON    BIT(7)
+#define VBOX_GUEST_STAT_PAGE_FILE_SIZE      BIT(8)
 
 
@@ -371 +373 @@
     /** Reported statistics */
     uint32_t        u32StatCaps;
-    /** CPU load (0-100) */
-    uint32_t        u32CpuLoad;
+    /** Idle CPU load (0-100) for last interval */
+    uint32_t        u32CpuLoad_Idle;
+    /** Kernel CPU load (0-100) for last interval */
+    uint32_t        u32CpuLoad_Kernel;
+    /** User CPU load (0-100) for last interval */
+    uint32_t        u32CpuLoad_User;
     /** Nr of threads */
     uint32_t        u32Threads;

trunk/src/VBox/Main/GuestImpl.cpp

@@ -270 +270 @@
     switch(statistic)
     {
-    case GuestStatisticType_CPULoad:
+    case GuestStatisticType_CPULoad_Idle:
+    case GuestStatisticType_CPULoad_Kernel:
+    case GuestStatisticType_CPULoad_User:
     case GuestStatisticType_Threads:
     case GuestStatisticType_Processes:
@@ -290 +292 @@
     switch(statistic)
     {
-    case GuestStatisticType_CPULoad:
+    case GuestStatisticType_CPULoad_Idle:
+    case GuestStatisticType_CPULoad_Kernel:
+    case GuestStatisticType_CPULoad_User:
     case GuestStatisticType_Threads:
     case GuestStatisticType_Processes:

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -404 +404 @@
         return VERR_INVALID_PARAMETER; /** @todo wrong error */
 
-    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD)
-        guest->SetStatistic(GuestStatisticType_CPULoad, pGuestStats->u32CpuLoad);
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_IDLE)
+        guest->SetStatistic(GuestStatisticType_CPULoad_Idle, pGuestStats->u32CpuLoad_Idle);
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_KERNEL)
+        guest->SetStatistic(GuestStatisticType_CPULoad_Kernel, pGuestStats->u32CpuLoad_Kernel);
+
+    if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_USER)
+        guest->SetStatistic(GuestStatisticType_CPULoad_User, pGuestStats->u32CpuLoad_User);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_THREADS)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -409 +409 @@
   <enum
      name="GuestStatisticType"
-     uuid="a7cffd08-665f-4156-b2e9-2b3c64e213da"
+     uuid="42d6b94f-9b17-4a9c-8d6f-a837c383eed0"
      >
-    <const name="CPULoad"              value="0">
-      <desc>
-        Current CPU load (0-100%).
+    <const name="CPULoad_Idle"         value="0">
+      <desc>
+        Idle CPU load (0-100%) for last interval.
       </desc>
     </const>
-    <const name="Threads"              value="1">
+    <const name="CPULoad_Kernel"       value="1">
+      <desc>
+        Kernel CPU load (0-100%) for last interval.
+      </desc>
+    </const>
+    <const name="CPULoad_User"         value="2">
+      <desc>
+        User CPU load (0-100%) for last interval.
+      </desc>
+    </const>
+    <const name="Threads"              value="3">
       <desc>
         Total number of threads in the system.
       </desc>
     </const>
-    <const name="Processes"            value="2">
+    <const name="Processes"            value="5">
       <desc>
         Total number of processes in the system.
       </desc>
     </const>
-    <const name="PhysMemTotal"         value="3">
+    <const name="PhysMemTotal"         value="6">
       <desc>
         Total physical memory in megabytes.
       </desc>
     </const>
-    <const name="PhysMemAvailable"     value="4">
+    <const name="PhysMemAvailable"     value="7">
       <desc>
         Free physical memory in megabytes.
       </desc>
     </const>
-    <const name="PhysMemBalloon"       value="5">
+    <const name="PhysMemBalloon"       value="8">
       <desc>
         Ballooned physical memory in megabytes.
       </desc>
     </const>
-    <const name="PageFileSize"         value="6">
+    <const name="PageFileSize"         value="9">
       <desc>
         Pagefile size in megabytes.