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

Timestamp:

Aug 18, 2008 2:52:12 PM (16 years ago)

Author:

vboxsync

Message:

Perf API: CPU/MHz counter re-introduced (Win implementation).

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (3 diffs)
• Makefile.kmk (modified) (1 diff)
• testcase/Makefile.kmk (modified) (1 diff)
• win/PerformanceWin.cpp (modified) (2 diffs)

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 *ramUsageTotal = new pm::SubMetric ("RAM/Usage/Total");
     pm::SubMetric *ramUsageUsed  = new pm::SubMetric ("RAM/Usage/Used");
@@ -2750 +2751 @@
                                           cpuLoadIdle);
     aCollector->registerBaseMetric (cpuLoad);
+    pm::BaseMetric *cpuMhz =
+        metricFactory->createHostCpuMHz (objptr, cpuMhzSM);
+    aCollector->registerBaseMetric (cpuMhz);
     pm::BaseMetric *ramUsage =
         metricFactory->createHostRamUsage (objptr, ramUsageTotal, ramUsageUsed,
@@ -2777 +2781 @@
                                                new pm::AggregateMin()));
     aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle,
+                                               new pm::AggregateMax()));
+
+    aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM, 0));
+    aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM,
+                                               new pm::AggregateAvg()));
+    aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM,
+                                               new pm::AggregateMin()));
+    aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM,
                                                new pm::AggregateMax()));
 

trunk/src/VBox/Main/Makefile.kmk

@@ -276 +276 @@
 VBoxSVC_SOURCES.win     +=     win/PerformanceWin.cpp
 VBoxSVC_LDFLAGS.solaris += -lkstat
-VBoxSVC_LDFLAGS.win     += wbemuuid.lib
+VBoxSVC_LDFLAGS.win     += wbemuuid.lib powrprof.lib
 endif
 

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -113 +113 @@
 tstCollector_INCS     = ../include
 tstCollector_LDFLAGS.solaris += -lkstat
-tstCollector_LDFLAGS.win += wbemuuid.lib
+tstCollector_LDFLAGS.win += wbemuuid.lib powrprof.lib
 
 

trunk/src/VBox/Main/win/PerformanceWin.cpp

@@ -23 +23 @@
 
 #include <Wbemidl.h>
+extern "C" {
+#include <powrprof.h>
+}
 #include <iprt/err.h>
+#include <iprt/mp.h>
 
 #include "Logging.h"
@@ -334 +338 @@
 }
 
+typedef struct _PROCESSOR_POWER_INFORMATION {
+  ULONG  Number;
+  ULONG  MaxMhz;
+  ULONG  CurrentMhz;
+  ULONG  MhzLimit;
+  ULONG  MaxIdleState;
+  ULONG  CurrentIdleState;
+} PROCESSOR_POWER_INFORMATION , *PPROCESSOR_POWER_INFORMATION;
+
 int CollectorWin::getHostCpuMHz(ULONG *mhz)
 {
-    return VERR_NOT_IMPLEMENTED;
+    uint64_t uTotalMhz   = 0;
+    RTCPUID  nProcessors = RTMpGetCount();
+    PPROCESSOR_POWER_INFORMATION ppi = new PROCESSOR_POWER_INFORMATION[nProcessors];
+    LONG ns = CallNtPowerInformation(ProcessorInformation, NULL, 0, ppi,
+        nProcessors * sizeof(PROCESSOR_POWER_INFORMATION));
+    if (ns)
+    {
+        Log(("CallNtPowerInformation() -> %x\n", ns));
+        return VERR_INTERNAL_ERROR;
+    }
+
+    /* Compute an average over all CPUs */
+    for (unsigned i = 0; i < nProcessors;  i++)
+        uTotalMhz += ppi[i].CurrentMhz;
+    *mhz = (ULONG)(uTotalMhz / nProcessors);
+
+    LogFlowThisFunc(("mhz=%u\n", *mhz));
+    LogFlowThisFuncLeave();
+
+    return VINF_SUCCESS;
 }