Changeset 28506 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Apr 20, 2010 8:36:25 AM (15 years ago)

Author:

vboxsync

Message:

Guest statistics: be more verbose on error in Linux guests; added missing CPU/user to Solaris guests (copy'n'paste error)

File:

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

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

@@ -344 +344 @@
         RTStrmClose(pStrm);
     }
+    else
+        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: memory info not available!\n");
 
     req.guestStats.u32PageSize = getpagesize();
@@ -361 +363 @@
     /** @todo req.guestStats.u32MemKernelNonPaged, make any sense? = 0? */
 
+    bool fCpuInfoAvail = false;
     rc = RTStrmOpen("/proc/stat", "r", &pStrm);
     if (RT_SUCCESS(rc))
@@ -414 +417 @@
                                                                  + u64DeltaNice) * 100 / u64DeltaAll);
                     req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_CPU_LOAD_IDLE \
-                                               | VBOX_GUEST_STAT_CPU_LOAD_KERNEL \
-                                               | VBOX_GUEST_STAT_CPU_LOAD_USER;
+                                               |  VBOX_GUEST_STAT_CPU_LOAD_KERNEL \
+                                               |  VBOX_GUEST_STAT_CPU_LOAD_USER;
+                    fCpuInfoAvail = true;
                     rc = VbglR3StatReport(&req);
                     if (RT_SUCCESS(rc))
@@ -422 +426 @@
                         VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
                 }
+                else
+                    VBoxServiceVerbose(3, "VBoxStatsReportStatistics: skipping information for CPU%u\n", u32CpuId);
             }
         }
         RTStrmClose(pStrm);
+    }
+    if (!fCpuInfoAvail)
+    {
+        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: CPU info not available!\n");
+        rc = VbglR3StatReport(&req);
+        if (RT_SUCCESS(rc))
+            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics reported successfully!\n");
+        else
+            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
     }
 
@@ -542 +557 @@
                 req.guestStats.u32CpuLoad_Idle   = (uint32_t)(u64DeltaIdle   * 100 / u64DeltaAll);
                 req.guestStats.u32CpuLoad_Kernel = (uint32_t)(u64DeltaSystem * 100 / u64DeltaAll);
+                req.guestStats.u32CpuLoad_User   = (uint32_t)(u64DeltaUser   * 100 / u64DeltaAll);
 
                 req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_CPU_LOAD_IDLE \
-                                           | VBOX_GUEST_STAT_CPU_LOAD_KERNEL \
-                                           | VBOX_GUEST_STAT_CPU_LOAD_USER;
+                                           |  VBOX_GUEST_STAT_CPU_LOAD_KERNEL \
+                                           |  VBOX_GUEST_STAT_CPU_LOAD_USER;
 
                 cCPUs++;