Changeset 28507 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Guest statistics: fixed reporting of Solaris guest CPU information for each guest CPU

File:

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

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

@@ -283 +283 @@
         rc = VbglR3StatReport(&req);
         if (RT_SUCCESS(rc))
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics reported successfully!\n");
+            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", i);
         else
             VBoxServiceVerbose(3, "VBoxStatsReportStatistics: DeviceIoControl (stats report) failed with %d\n", GetLastError());
@@ -422 +422 @@
                     rc = VbglR3StatReport(&req);
                     if (RT_SUCCESS(rc))
-                        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics reported successfully!\n");
+                        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", u32CpuId);
                     else
                         VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
@@ -532 +532 @@
         kstat_t *pStatNode = NULL;
         uint32_t cCPUs = 0;
+        bool fCpuInfoAvail = false;
         for (pStatNode = pStatKern->kc_chain; pStatNode != NULL; pStatNode = pStatNode->ks_next)
         {
@@ -562 +563 @@
                                            |  VBOX_GUEST_STAT_CPU_LOAD_KERNEL \
                                            |  VBOX_GUEST_STAT_CPU_LOAD_USER;
-
+                fCpuInfoAvail = true;
+
+                rc = VbglR3StatReport(&req);
+                if (RT_SUCCESS(rc))
+                    VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", cCpus);
+                else
+                    VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
                 cCPUs++;
             }
@@ -570 +577 @@
          * Report whatever statistics were collected.
          */
-        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);
+        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);
+        }
 
         kstat_close(pStatKern);