Changeset 11498 in vbox for trunk

Timestamp:

Aug 19, 2008 6:50:33 PM (16 years ago)

Author:

vboxsync

Message:

PerfAPI: Moved linux implementation of CPU/MHz to CollectorHAL since it is generic. Windows implementation needs to be moved to RTMpGetCurFrequency.

Location:

trunk/src/VBox/Main

Files:

• Performance.cpp (modified) (3 diffs)
• include/Performance.h (modified) (1 diff)
• linux/PerformanceLinux.cpp (modified) (3 diffs)

trunk/src/VBox/Main/Performance.cpp

@@ -25 +25 @@
  * @todo list:
  *
- * 1) Solaris backend
- * 2) Linux backend
- * 3) Detection of erroneous metric names
- * 4) Min/max ranges for metrics
- * 5) Darwin backend
- * 6) [OS/2 backend]
+ * 1) Detection of erroneous metric names
+ * 2) Wildcards in metric names
+ * 3) Darwin backend
+ * 4) [OS/2 backend]
  */
 
@@ -39 +37 @@
 #include <iprt/string.h>
 #include <iprt/mem.h>
+#include <iprt/mp.h>
 
 #include "Logging.h"
@@ -93 +92 @@
 {
     return E_NOTIMPL;
+}
+
+/* Generic implementations */
+
+int CollectorHAL::getHostCpuMHz(ULONG *mhz)
+{
+    RTCPUID nProcessors = RTMpGetCount();
+
+    if (nProcessors == 0)
+        return VERR_NOT_IMPLEMENTED;
+
+    uint64_t uTotalMHz  = 0;
+
+    for (RTCPUID i = 0; i < nProcessors; ++i)
+        uTotalMHz += RTMpGetCurFrequency(RTMpCpuIdFromSetIndex(i));
+
+    *mhz = (ULONG)(uTotalMHz / nProcessors);
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/Main/include/Performance.h

@@ -67 +67 @@
     public:
         virtual int getHostCpuLoad(ULONG *user, ULONG *kernel, ULONG *idle);
-        virtual int getHostCpuMHz(ULONG *mhz) = 0;
+        virtual int getHostCpuMHz(ULONG *mhz);
         virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available) = 0;
         virtual int getProcessCpuLoad(RTPROCESS process, ULONG *user, ULONG *kernel);

trunk/src/VBox/Main/linux/PerformanceLinux.cpp

@@ -25 +25 @@
 #include <iprt/alloc.h>
 #include <iprt/err.h>
-#include <iprt/mp.h>
 #include <iprt/param.h>
 #include <iprt/string.h>
@@ -35 +34 @@
 {
 public:
-    virtual int getHostCpuMHz(ULONG *mhz);
     virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
     virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
@@ -93 +91 @@
 
     return rc;
-}
-
-int CollectorLinux::getHostCpuMHz(ULONG *mhz)
-{
-    RTCPUID nProcessors = RTMpGetCount();
-    uint64_t uTotalMHz  = 0;
-
-    for (RTCPUID i = 0; i < nProcessors; ++i)
-        uTotalMHz += RTMpGetCurFrequency(RTMpCpuIdFromSetIndex(i));
-
-    *mhz = (ULONG)(uTotalMHz / nProcessors);
-    return VINF_SUCCESS;
 }