Changeset 4571 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Future proof

Location:

trunk

Files:

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

trunk/include/VBox/VBoxGuest.h

@@ -371 +371 @@
 typedef struct VBoxGuestStatistics
 {
+    /** Virtual CPU id */
+    uint32_t        u32CpuId;
     /** Reported statistics */
     uint32_t        u32StatCaps;

trunk/src/VBox/Main/GuestImpl.cpp

@@ -263 +263 @@
 }
 
-STDMETHODIMP Guest::GetStatistic(GuestStatisticType_T statistic, ULONG *aStatVal)
+STDMETHODIMP Guest::GetStatistic(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG *aStatVal)
 {
     if (!aStatVal)
         return E_INVALIDARG;
 
-    switch(statistic)
+    if (aCpuId != 0)
+        return E_INVALIDARG;
+
+    switch(aStatistic)
     {
     case GuestStatisticType_CPULoad_Idle:
@@ -288 +291 @@
 }
 
-STDMETHODIMP Guest::SetStatistic(GuestStatisticType_T statistic, ULONG aStatVal)
-{
-    switch(statistic)
+STDMETHODIMP Guest::SetStatistic(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG aStatVal)
+{
+    if (aCpuId != 0)
+        return E_INVALIDARG;
+
+    switch(aStatistic)
     {
     case GuestStatisticType_CPULoad_Idle:

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -405 +405 @@
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_IDLE)
-        guest->SetStatistic(GuestStatisticType_CPULoad_Idle, pGuestStats->u32CpuLoad_Idle);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_CPULoad_Idle, pGuestStats->u32CpuLoad_Idle);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_KERNEL)
-        guest->SetStatistic(GuestStatisticType_CPULoad_Kernel, pGuestStats->u32CpuLoad_Kernel);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_CPULoad_Kernel, pGuestStats->u32CpuLoad_Kernel);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_USER)
-        guest->SetStatistic(GuestStatisticType_CPULoad_User, pGuestStats->u32CpuLoad_User);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_CPULoad_User, pGuestStats->u32CpuLoad_User);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_THREADS)
-        guest->SetStatistic(GuestStatisticType_Threads, pGuestStats->u32Threads);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_Threads, pGuestStats->u32Threads);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PROCESSES)
-        guest->SetStatistic(GuestStatisticType_Processes, pGuestStats->u32Processes);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_Processes, pGuestStats->u32Processes);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_TOTAL)
-        guest->SetStatistic(GuestStatisticType_PhysMemTotal, pGuestStats->u32PhysMemTotal);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PhysMemTotal, pGuestStats->u32PhysMemTotal);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_AVAIL)
-        guest->SetStatistic(GuestStatisticType_PhysMemAvailable, pGuestStats->u32PhysMemAvail);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PhysMemAvailable, pGuestStats->u32PhysMemAvail);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_BALLOON)
-        guest->SetStatistic(GuestStatisticType_PhysMemBalloon, pGuestStats->u32PhysMemBalloon);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PhysMemBalloon, pGuestStats->u32PhysMemBalloon);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PAGE_FILE_SIZE)
-        guest->SetStatistic(GuestStatisticType_PageFileSize, pGuestStats->u32PageFileSize);
+        guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PageFileSize, pGuestStats->u32PageFileSize);
 
     return VINF_SUCCESS;

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

@@ -4380 +4380 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="5d54a565-813c-42a0-a81a-e31779e03186"
+     uuid="c101f037-b03d-4bd4-bd25-381123980be2"
      wsmap="suppress"
      >
@@ -4468 +4468 @@
         Query specified guest statistics as reported by the VirtualBox Additions.
       </desc>
+      <param name="cpuId" type="unsigned long" dir="in">
+        <desc>Virtual CPU id; not relevant for all statistic types</desc>
+      </param>
       <param name="statistic" type="GuestStatisticType" dir="in">
         <desc>Statistic type.</desc>

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

@@ -64 +64 @@
     STDMETHOD(SetCredentials)(INPTR BSTR aUserName, INPTR BSTR aPassword,
                               INPTR BSTR aDomain, BOOL aAllowInteractiveLogon);
-    STDMETHOD(GetStatistic)(GuestStatisticType_T statistic, ULONG *aStatVal);
+    STDMETHOD(GetStatistic)(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG *aStatVal);
 
     // public methods that are not in IDL
@@ -71 +71 @@
     void setSupportsSeamless (BOOL aSupportsSeamless);
 
-    STDMETHOD(SetStatistic)(GuestStatisticType_T statistic, ULONG aStatVal);
+    STDMETHOD(SetStatistic)(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG aStatVal);
 
     // for VirtualBoxSupportErrorInfoImpl