Changeset 11481 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 19, 2008 12:13:53 PM (16 years ago)

Author:

vboxsync

Message:

PerfAPI: CPU/MHz counter name fix, proper handling of zero periods and counts

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (1 diff)
• Performance.cpp (modified) (1 diff)
• PerformanceImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -2739 +2739 @@
     pm::SubMetric *cpuLoadKernel = new pm::SubMetric ("CPU/Load/Kernel");
     pm::SubMetric *cpuLoadIdle   = new pm::SubMetric ("CPU/Load/Idle");
-    pm::SubMetric *cpuMhzSM      = new pm::SubMetric ("CPU/MHZ");
+    pm::SubMetric *cpuMhzSM      = new pm::SubMetric ("CPU/MHz");
     pm::SubMetric *ramUsageTotal = new pm::SubMetric ("RAM/Usage/Total");
     pm::SubMetric *ramUsageUsed  = new pm::SubMetric ("RAM/Usage/Used");

trunk/src/VBox/Main/Performance.cpp

@@ -272 +272 @@
         RTMemFree(mData);
     mLength = length;
-    mData = (ULONG *)RTMemAllocZ(length * sizeof(ULONG));
+    if (mLength)
+        mData = (ULONG *)RTMemAllocZ(length * sizeof(ULONG));
+    else
+        mData = NULL;
     mWrapped = false;
     mEnd = 0;

trunk/src/VBox/Main/PerformanceImpl.cpp

@@ -266 +266 @@
                       " count to %u for %s\n", aPeriod, aCount, (*it)->getName()));
             (*it)->init(aPeriod, aCount);
-            LogFlow (("PerformanceCollector::SetupMetrics() enabling %s\n",
-                      aPeriod, aCount, (*it)->getName()));
-            (*it)->enable();
+            if (aPeriod == 0 || aCount == 0)
+            {
+                LogFlow (("PerformanceCollector::SetupMetrics() disabling %s\n",
+                          (*it)->getName()));
+                (*it)->disable();
+            }
+            else
+            {
+                LogFlow (("PerformanceCollector::SetupMetrics() enabling %s\n",
+                          (*it)->getName()));
+                (*it)->enable();
+            }
         }