Changeset 10399 in vbox for trunk

Timestamp:

Jul 9, 2008 9:52:56 AM (16 years ago)

Author:

vboxsync

Message:

Main API fix for getting processor speed/description - there's no guarantee that all cpus will stick to same properties forever. So query by cpuId.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (9 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/HostImpl.h (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -101 +101 @@
 #include <VBox/err.h>
 #include <iprt/string.h>
+/** @todo the following line becomes obsolete after switching to Mp runtime functions */
 #include <iprt/system.h>
+#include <iprt/mp.h>
 #include <iprt/time.h>
 #include <iprt/param.h>
@@ -667 +669 @@
     CHECK_READY();
     *count = RTSystemProcessorGetCount();
+    /** @todo after implementing the Mp runtime on all platforms replace with
+     * *count = RTMpGetOnlineCount(); */
     return S_OK;
 }
 
 /**
- * Returns the (approximate) speed of the host CPU in MHz
+ * Returns the (approximate) maximum speed of the given host CPU in MHz
  *
  * @returns COM status code
- * @param   speed address of result variable
+ * @param   cpu id to get info for.
+ * @param   speed address of result variable, speed is 0 if unknown or cpuId is invalid.
  */
-STDMETHODIMP Host::COMGETTER(ProcessorSpeed)(ULONG *speed)
+STDMETHODIMP Host::COMGETTER(ProcessorSpeed)(ULONG cpuId, ULONG *speed)
 {
     if (!speed)
@@ -682 +687 @@
     AutoWriteLock alock (this);
     CHECK_READY();
-    /** @todo Add a runtime function for this which uses GIP. */
+    /** @todo after implementing the Mp runtime on all platforms replace with
+     * *speed = RTMpGetOnlineCpuMaxSpeed(cpuId); */
+    *speed = 0;
     return S_OK;
 }
@@ -689 +696 @@
  *
  * @returns COM status code
- * @param   description address of result variable
+ * @param   cpu id to get info for.
+ * @param   description address of result variable, NULL if known or cpuId is invalid.
  */
-STDMETHODIMP Host::COMGETTER(ProcessorDescription)(BSTR *description)
+STDMETHODIMP Host::COMGETTER(ProcessorDescription)(ULONG cpuId, BSTR *description)
 {
     if (!description)
@@ -698 +706 @@
     CHECK_READY();
     /** @todo */
-    return S_OK;
+    return E_NOTIMPL;
 }
 
@@ -715 +723 @@
     CHECK_READY();
     /** @todo */
-    return S_OK;
+    return E_NOTIMPL;
 }
 
@@ -731 +739 @@
     CHECK_READY();
     /** @todo */
-    return S_OK;
+    return E_NOTIMPL;
 }
 
@@ -747 +755 @@
     CHECK_READY();
     /** @todo */
-    return S_OK;
+    return E_NOTIMPL;
 }
 
@@ -763 +771 @@
     CHECK_READY();
     /** @todo */
-    return S_OK;
+    return E_NOTIMPL;
 }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4805 +4805 @@
   <interface
      name="IHost" extends="$unknown"
-     uuid="a42a480f-d554-4be0-b11c-6c2e54dd1274"
+     uuid="3d864057-ae6b-4d05-9cf7-c341139b6062"
      wsmap="managed"
      >
@@ -4879 +4879 @@
     </attribute>
 
-    <attribute name="processorSpeed" type="unsigned long" readonly="yes">
-      <desc>(Approximate) speed of the host CPU in Megahertz.</desc>
-    </attribute>
-
-    <attribute name="processorDescription" type="wstring" readonly="yes">
-      <desc>Description string of the host CPU.</desc>
-    </attribute>
+    <method name="getProcessorSpeed">
+      <desc>Query the (approximate) maximum speed of a specified host CPU in Megahertz.</desc>
+      <param name="cpuId" type="unsigned long" dir="in">
+        <desc>
+          Identifier of the CPU.
+        </desc>
+      </param>
+      <param name="speed" type="unsigned long" dir="return">
+        <desc>
+          Speed value. 0 is returned if value is not known or @a cpuId is
+          invalid.
+        </desc>
+      </param>
+    </method>
+
+    <method name="getProcessorDescription">
+      <desc>Query the model string of a specified host CPU.</desc>
+      <param name="cpuId" type="unsigned long" dir="in">
+        <desc>
+          Identifier of the CPU.
+        </desc>
+      </param>
+      <param name="description" type="wstring" dir="return">
+        <desc>
+          Model string. A NULL string is returned if value is not known or
+          @a cpuId is invalid.
+        </desc>
+      </param>
+    </method>
 
     <attribute name="memorySize" type="unsigned long" readonly="yes">

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

@@ -89 +89 @@
 #endif
     STDMETHOD(COMGETTER(ProcessorCount))(ULONG *count);
-    STDMETHOD(COMGETTER(ProcessorSpeed))(ULONG *speed);
-    STDMETHOD(COMGETTER(ProcessorDescription))(BSTR *description);
+    STDMETHOD(COMGETTER(ProcessorSpeed))(ULONG cpuId, ULONG *speed);
+    STDMETHOD(COMGETTER(ProcessorDescription))(ULONG cpuId, BSTR *description);
     STDMETHOD(COMGETTER(MemorySize))(ULONG *size);
     STDMETHOD(COMGETTER(MemoryAvailable))(ULONG *available);