Changeset 62097 in vbox

Timestamp:

Jul 7, 2016 9:08:21 AM (9 years ago)

Author:

vboxsync

Message:

Additions/VBoxService: fixed harmless bug leading to submitting the last CPU info request twice with Windows guests

File:

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

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

@@ -263 +263 @@
             req.guestStats.u32CpuLoad_User   = (uint32_t)(deltaUser  * 100 / ullTotalTime);
 
-            req.guestStats.u32StatCaps      |= VBOX_GUEST_STAT_CPU_LOAD_IDLE | VBOX_GUEST_STAT_CPU_LOAD_KERNEL
+            req.guestStats.u32StatCaps      |= VBOX_GUEST_STAT_CPU_LOAD_IDLE
+                                            |  VBOX_GUEST_STAT_CPU_LOAD_KERNEL
                                             |  VBOX_GUEST_STAT_CPU_LOAD_USER;
             req.guestStats.u32CpuId          = i;
+            fCpuInfoAvail = true;
             int rc = VbglR3StatReport(&req);
             if (RT_SUCCESS(rc))
@@ -418 +420 @@
                     g_VMStat.au64LastCpuLoad_Nice[u32CpuId]   = u64Nice;
 
-                    req.guestStats.u32CpuId = u32CpuId;
                     req.guestStats.u32CpuLoad_Idle   = (uint32_t)(u64DeltaIdle   * 100 / u64DeltaAll);
                     req.guestStats.u32CpuLoad_Kernel = (uint32_t)(u64DeltaSystem * 100 / u64DeltaAll);
@@ -426 +427 @@
                                                |  VBOX_GUEST_STAT_CPU_LOAD_KERNEL
                                                |  VBOX_GUEST_STAT_CPU_LOAD_USER;
+                    req.guestStats.u32CpuId = u32CpuId;
                     fCpuInfoAvail = true;
                     rc = VbglR3StatReport(&req);
@@ -582 +584 @@
                                                |  VBOX_GUEST_STAT_CPU_LOAD_USER;
                     fCpuInfoAvail = true;
-
                     rc = VbglR3StatReport(&req);
                     if (RT_SUCCESS(rc))