Changeset 56457 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 16, 2015 4:03:13 PM (10 years ago)

Author:

vboxsync

Message:

Additions/VBoxService: properly report the CPU load of each VCPU

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp

@@ -214 +214 @@
 
     /* Unfortunately GetSystemTimes is XP SP1 and up only, so we need to use the semi-undocumented NtQuerySystemInformation */
+    bool fCpuInfoAvail = false;
     NTSTATUS rc = gCtx.pfnNtQuerySystemInformation(SystemProcessorPerformanceInformation, pProcInfo, cbStruct, &cbReturned);
     if (    !rc
         &&  cbReturned == cbStruct)
     {
-        for (uint32_t i = 0; i < systemInfo.dwNumberOfProcessors && i < VMM_MAX_CPU_COUNT; i++)
-        {
+        for (uint32_t i = 0; i < systemInfo.dwNumberOfProcessors; i++)
+        {
+            if (i >= VMM_MAX_CPU_COUNT)
+            {
+                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: skipping information for CPU%u\n", i);
+                continue;
+            }
+
             if (gCtx.au64LastCpuLoad_Kernel[i] == 0)
             {
@@ -246 +253 @@
 
             req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_CPU_LOAD_IDLE | VBOX_GUEST_STAT_CPU_LOAD_KERNEL | VBOX_GUEST_STAT_CPU_LOAD_USER;
-
-            gCtx.au64LastCpuLoad_Idle[i]   = pProcInfo[i].IdleTime.QuadPart;
-            gCtx.au64LastCpuLoad_Kernel[i] = pProcInfo[i].KernelTime.QuadPart;
-            gCtx.au64LastCpuLoad_User[i]   = pProcInfo[i].UserTime.QuadPart;
-        }
-    }
-    RTMemFree(pProcInfo);
-
-    for (uint32_t i = 0; i < systemInfo.dwNumberOfProcessors; i++)
-    {
-        if (i < VMM_MAX_CPU_COUNT)
-        {
             req.guestStats.u32CpuId = i;
             rc = VbglR3StatReport(&req);
@@ -264 +259 @@
             else
                 VBoxServiceVerbose(3, "VBoxStatsReportStatistics: DeviceIoControl (stats report) failed with %d\n", GetLastError());
-        }
-        else
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: skipping information for CPU%u\n", i);
+
+            gCtx.au64LastCpuLoad_Idle[i]   = pProcInfo[i].IdleTime.QuadPart;
+            gCtx.au64LastCpuLoad_Kernel[i] = pProcInfo[i].KernelTime.QuadPart;
+            gCtx.au64LastCpuLoad_User[i]   = pProcInfo[i].UserTime.QuadPart;
+        }
+    }
+    RTMemFree(pProcInfo);
+
+    if (!fCpuInfoAvail)
+    {
+        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: CPU info not available!\n");
+        rc = VbglR3StatReport(&req);
     }