Changeset 10528 in vbox

Timestamp:

Jul 11, 2008 2:27:01 PM (16 years ago)

Author:

vboxsync

Message:

Performance API, version 0, webservice broken.

Location:

trunk

Files:

• include/iprt/system.h (modified) (2 diffs)
• src/VBox/Main/HostImpl.cpp (modified) (5 diffs)
• src/VBox/Main/MachineImpl.cpp (modified) (6 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/VirtualBoxImpl.cpp (modified) (3 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (5 diffs)
• src/VBox/Main/include/HostImpl.h (modified) (4 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (5 diffs)
• src/VBox/Main/include/VirtualBoxImpl.h (modified) (4 diffs)
• src/VBox/Main/testcase/tstAPI.cpp (modified) (1 diff)
• src/VBox/Main/xpcom/server.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/os2/system-os2.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/posix/system-posix.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/system-win.cpp (modified) (1 diff)

trunk/include/iprt/system.h

@@ -34 +34 @@
 #include <iprt/types.h>
 
-#define IPRT_USAGE_MULTIPLIER   UINT64_C(1000000000)
-
-/**
- * This structure holds both computed and raw values of overall CPU load counters.
- *
- * @todo r=bird: What does these values mean?
- *
- *               Also, I no longer use 'u32', 'u16', 'u8', 'u64', etc unless this information
- *               is really important for the user. So, unless there is a better prefix just
- *               stick to 'u' here.
- *
- *               The name of the struct should include the prefix or a shortened
- *               version of it: RTSYSCPUUSAGESTATS
- *
- *               Also, I'd sugest calling it RTSYSCPULOADSTATS, replacing 'usage' with 'load',
- *               no particular reason, other than that it is easier to read in the (silly)
- *               condensed form we use for typedefs here.
- *
- *               Finally, I'm wondering how portable this is. I'd like to see what APIs are
- *               available on the important systems (Windows, Solaris, Linux) and compare
- *               the kind of info they return. This should be done in the defect *before*
- *               any of the above, please.
- */
-typedef struct RTSYSCPUUSAGESTATS
-{
-    uint32_t u32User;
-    uint32_t u32System;
-    uint32_t u32Idle;
-    /* Internal raw counter values. */
-    uint32_t u32RawUser;
-    uint32_t u32RawNice;
-    uint32_t u32RawSystem;
-    uint32_t u32RawIdle;
-} RTCPUUSAGESTATS;
-typedef RTCPUUSAGESTATS *PRTCPUUSAGESTATS;
-
-/* This structure holds both computed and raw values of per-VM CPU load counters. */
-typedef struct
-{
-    uint32_t u32User;
-    uint32_t u32System;
-    /* Internal raw counter values. */
-    uint64_t u64RawTotal;
-    uint32_t u32RawProcUser;
-    uint32_t u32RawProcSystem;
-} RTPROCCPUUSAGESTATS;
-typedef RTPROCCPUUSAGESTATS *PRTPROCCPUUSAGESTATS;
-
 
 __BEGIN_DECLS
@@ -108 +60 @@
 RTDECL(uint64_t) RTSystemProcessorGetActiveMask(void);
 
-/**
- * Gets the current figures of overall system processor usage.
- *
- * @remarks To get meaningful stats this function has to be
- *          called twice with a bit of delay between calls. This
- *          is due to the fact that at least two samples of
- *          system usage stats are needed to calculate the load.
- *
- * @returns IPRT status code.
- * @param   pStats  Pointer to the structure that contains the
- *                  results. Note that this structure is
- *                  modified with each call to this function and
- *                  is used to provide both in and out values.
- * @todo r=bird: Change to RTSystemGetCpuLoadStats.
- */
-RTDECL(int) RTSystemProcessorGetUsageStats(PRTCPUUSAGESTATS pStats);
-
-/**
- * Gets the current processor usage for a partucilar process.
- *
- * @remarks To get meaningful stats this function has to be
- *          called twice with a bit of delay between calls. This
- *          is due to the fact that at least two samples of
- *          system usage stats are needed to calculate the load.
- *
- * @returns IPRT status code.
- * @param   pid     VM process id.
- * @param   pStats  Pointer to the structure that contains the
- *                  results. Note that this structure is
- *                  modified with each call to this function and
- *                  is used to provide both in and out values.
- *
- * @todo    Perharps this function should be moved somewhere
- *          else.
- * @todo    r=bird: Yes is should, iprt/proc.h. RTProcGetCpuLoadStats.
- */
-RTDECL(int) RTProcessGetProcessorUsageStats(RTPROCESS pid, PRTPROCCPUUSAGESTATS pStats);
-
 /** @} */
 

trunk/src/VBox/Main/HostImpl.cpp

@@ -171 +171 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /* Start resource usage sampler */
-    {
-        int vrc = RTTimerCreate (&mUsageSampler, VBOX_USAGE_SAMPLER_INTERVAL,
-                                 UsageSamplerCallback, this);
-        AssertMsgRC (vrc, ("Failed to create resource usage sampling "
-                           "timer (%Rra)\n", vrc));
-        if (RT_FAILURE (vrc))
-            return E_FAIL;
-    }
+    registerMetrics(parent->getCollector());
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
@@ -195 +187 @@
 
     AssertReturn (isReady(), (void) 0);
+
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+    unregisterMetrics(mParent->getCollector());
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
 #ifdef VBOX_WITH_USB
@@ -211 +207 @@
     mUSBDeviceFilters.clear();
 #endif
-
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /* Destroy resource usage sampler */
-    {
-        int vrc = RTTimerDestroy (mUsageSampler);
-        AssertMsgRC (vrc, ("Failed to destroy resource usage "
-                           "sampling timer (%Rra)\n", vrc));
-    }
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
     setReady (FALSE);
@@ -1110 +1097 @@
     return E_NOTIMPL;
 #endif
-}
-
-STDMETHODIMP Host::GetProcessorUsage (ULONG *aUser, ULONG *aSystem, ULONG *aIdle)
-{
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-    if (aUser == NULL || aSystem == NULL || aIdle == NULL)
-        return E_POINTER;
-
-    *aUser   = mCpuStats.u32User;
-    *aSystem = mCpuStats.u32System;
-    *aIdle   = mCpuStats.u32Idle;
-
-    return S_OK;
-#else /* !VBOX_WITH_RESOURCE_USAGE_API */
-    return E_NOTIMPL;
-#endif /* !VBOX_WITH_RESOURCE_USAGE_API */
 }
 
@@ -2722 +2693 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-
-/* static */
-void Host::UsageSamplerCallback (PRTTIMER pTimer, void *pvUser, uint64_t iTick)
-{
-    AssertReturnVoid (pvUser != NULL);
-    static_cast <Host *> (pvUser)->usageSamplerCallback();
-}
-
-void Host::usageSamplerCallback()
-{
-    int vrc = RTSystemProcessorGetUsageStats (&mCpuStats);
-    AssertMsgRC (vrc, ("Failed to get CPU stats (%Rra)\n", vrc));
-
-//  LogFlowThisFunc (("user=%u%% system=%u%% &mCpuStats=%p\n",
-//                    mCpuStats.u32User / 10000000,
-//                    mCpuStats.u32System / 10000000, &mCpuStats);
-//  LogFlowThisFunc (("user=%.2f system=%.2f idle=%.2f\n", mCpuStats.u32User/10000000.,
-//                    mCpuStats.u32System/10000000., mCpuStats.u32Idle/10000000.);
-}
-
+void Host::registerMetrics(PerformanceCollector *collector)
+{
+    pm::MetricFactory *metricFactory = collector->getMetricFactory();
+    // Create sub metrics
+    pm::SubMetric *cpuLoadUser = new pm::SubMetric("CPU/Load/User");
+    pm::SubMetric *cpuLoadKernel = new pm::SubMetric("CPU/Load/Kernel");
+    pm::SubMetric *cpuLoadIdle = new pm::SubMetric("CPU/Load/Idle");
+    // Create and register base metrics
+    IUnknown *objptr;
+    ComObjPtr<Host> tmp = this;
+    tmp.queryInterfaceTo(&objptr);
+    pm::BaseMetric *cpuLoad =
+        metricFactory->createHostCpuLoad(objptr, cpuLoadUser, cpuLoadKernel, cpuLoadIdle);
+    collector->registerBaseMetric(cpuLoad);
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, 0));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, new pm::AggregateAvg()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, new pm::AggregateMin()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, new pm::AggregateMax()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, 0));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, new pm::AggregateAvg()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, new pm::AggregateMin()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, new pm::AggregateMax()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, 0));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, new pm::AggregateAvg()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, new pm::AggregateMin()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, new pm::AggregateMax()));
+};
+
+void Host::unregisterMetrics(PerformanceCollector *collector)
+{
+    collector->unregisterMetricsFor(this);
+    collector->unregisterBaseMetricsFor(this);
+};
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -147 +147 @@
     mSession.mPid = NIL_RTPROCESS;
     mSession.mState = SessionState_Closed;
-
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-    mUsageSampler = NULL;
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 }
 
@@ -501 +497 @@
     }
 
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /* Start resource usage sampler */
-    {
-        vrc = RTTimerCreate (&mData->mUsageSampler, VBOX_USAGE_SAMPLER_INTERVAL,
-                             Machine::UsageSamplerCallback, this);
-        AssertMsgRC (vrc, ("Failed to create resource usage "
-                            "sampling timer(%Rra)\n", vrc));
-        if (RT_FAILURE (vrc))
-            rc = E_FAIL;
-    }
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
-
     LogFlowThisFunc (("mName='%ls', mRegistered=%RTbool, mAccessible=%RTbool "
                       "rc=%08X\n",
@@ -636 +620 @@
      */
     AutoMultiWriteLock2 alock (mParent, this);
-
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /* Destroy resource usage sampler */
-    {
-        int vrc = RTTimerDestroy (mData->mUsageSampler);
-        AssertMsgRC (vrc, ("Failed to destroy resource usage "
-                           "sampling timer (%Rra)\n", vrc));
-    }
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
     if (!mData->mSession.mMachine.isNull())
@@ -2814 +2789 @@
 }
 
-STDMETHODIMP Machine::GetProcessorUsage (ULONG *aUser, ULONG *aSystem)
-{
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-    if (aUser == NULL || aSystem == NULL)
-        return E_POINTER;
-
-//  LogFlowThisFunc (("user=%u%% system=%u%% &mData->mCpuStats=%p\n",
-//                    mData->mCpuStats.u32User / 10000000,
-//                    mData->mCpuStats.u32System / 10000000, &mData->mCpuStats));
-
-    *aUser   = mData->mCpuStats.u32User;
-    *aSystem = mData->mCpuStats.u32System;
-    return S_OK;
-#else /* !VBOX_WITH_RESOURCE_USAGE_API */
-    return E_NOTIMPL;
-#endif /* !VBOX_WITH_RESOURCE_USAGE_API */
-}
-
 
 // public methods for internal purposes
@@ -7320 +7277 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-
-/* static */
-void Machine::UsageSamplerCallback (PRTTIMER pTimer, void *pvUser, uint64_t iTick)
-{
-    AssertReturnVoid (pvUser != NULL);
-    static_cast <Machine *> (pvUser)->usageSamplerCallback();
-}
-
-void Machine::usageSamplerCallback()
-{
-//  LogFlowThisFunc (("mData->mSession.mPid = %u &mData->mCpuStats = %p)\n",
-//                    mData->mSession.mPid, &m_CpuStats));
-    if (mData->mSession.mPid != NIL_RTPROCESS)
-    {
-        int vrc = RTProcessGetProcessorUsageStats (mData->mSession.mPid,
-                                                   &mData->mCpuStats);
-        AssertMsgRC (vrc, ("Failed to get CPU stats (%Rra)\n", vrc));
-    }
-    else
-    {
-        mData->mCpuStats.u32User   = 0;
-        mData->mCpuStats.u32System = 0;
-    }
-//  LogFlowThisFunc (("user=%u%% system=%u%% &mData->mCpuStats=%p\n",
-//                    mData->mCpuStats.u32User / 10000000,
-//                    mData->mCpuStats.u32System / 10000000, &mData->mCpuStats));
-//  LogFlowThisFunc (("user=%.2f system=%.2f\n",
-//                    mData->mCpuStats.u32User/10000000., mData->mCpuStats.u32System/10000000.));
-}
-
+void Machine::registerMetrics(PerformanceCollector *collector)
+{
+    pm::MetricFactory *metricFactory = collector->getMetricFactory();
+    // Create sub metrics
+    pm::SubMetric *cpuLoadUser = new pm::SubMetric("CPU/Load/User");
+    pm::SubMetric *cpuLoadKernel = new pm::SubMetric("CPU/Load/Kernel");
+    // Create and register base metrics
+    IUnknown *objptr;
+
+    ComObjPtr<Machine> tmp = this;
+    tmp.queryInterfaceTo(&objptr);
+    pm::BaseMetric *cpuLoad =
+        metricFactory->createMachineCpuLoad(objptr, mData->mSession.mPid, cpuLoadUser, cpuLoadKernel);
+    collector->registerBaseMetric(cpuLoad);
+
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, 0));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, new pm::AggregateAvg()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, new pm::AggregateMin()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, new pm::AggregateMax()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, 0));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, new pm::AggregateAvg()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, new pm::AggregateMin()));
+    collector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, new pm::AggregateMax()));
+};
+
+void Machine::unregisterMetrics(PerformanceCollector *collector)
+{
+    collector->unregisterMetricsFor(this);
+    collector->unregisterBaseMetricsFor(this);
+};
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
 
 /////////////////////////////////////////////////////////////////////////////
@@ -10406 +10364 @@
     return S_OK;
 }
+
+

trunk/src/VBox/Main/Makefile.kmk

@@ -259 +259 @@
 VBoxSVC_SOURCES.solaris += solaris/USBProxyServiceSolaris.cpp
 VBoxSVC_SOURCES.win     +=     win/USBProxyServiceWindows.cpp
+endif
+
+ifdef VBOX_WITH_RESOURCE_USAGE_API
+VBoxSVC_SOURCES  += \
+        PerformanceImpl.cpp \
+        Performance.cpp
 endif
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -228 +228 @@
             Key global = tree.rootKey().key ("Global");
 
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+            /* create the performance collector object BEFORE host */
+            unconst (mData.mPerformanceCollector).createObject();
+            rc = mData.mPerformanceCollector->init ();
+            ComAssertComRCThrowRC (rc);
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
             /* create the host object early, machines will need it */
             unconst (mData.mHost).createObject();
@@ -376 +383 @@
     }
 
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+    if (mData.mPerformanceCollector)
+    {
+        mData.mPerformanceCollector->uninit();
+        unconst (mData.mPerformanceCollector).setNull();
+    }
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
     /*
      *  Uninit all other children still referenced by clients
@@ -571 +586 @@
     return S_OK;
 }
+
+STDMETHODIMP
+VirtualBox::COMGETTER(PerformanceCollector) (IPerformanceCollector **aPerformanceCollector)
+{
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+    if (!aPerformanceCollector)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    mData.mPerformanceCollector.queryInterfaceTo (aPerformanceCollector);
+
+    return S_OK;
+#else /* !VBOX_WITH_RESOURCE_USAGE_API */
+    return E_NOTIMPL;
+#endif /* !VBOX_WITH_RESOURCE_USAGE_API */
+}
+
 
 /**

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

@@ -885 +885 @@
   <interface
     name="IVirtualBox" extends="$dispatched"
-    uuid="2d3b9ea7-25f5-4f07-a8e1-7dd7e0dcf667"
+    uuid="557a07bc-e6ae-4520-a361-4a8493199137"
     wsmap="managed"
   >
@@ -1055 +1055 @@
           implemented and therefore this collection is always empty.
         </note>
+      </desc>
+    </attribute>
+    <attribute name="performanceCollector" type="IPerformanceCollector" readonly="yes">
+      <desc>
+        The only instance of IPerformanceCollector.
       </desc>
     </attribute>
@@ -3530 +3535 @@
     </method>
 
-    <method name="getProcessorUsage">
-      <desc>
-        Returns the current processor usage by this virtual machine measured
-        over all cores of all processors in the host system.
-
-        The values returned for each parameter are in range from <tt>0</tt> (the
-        machine is powered off or does not load the CPUs at all) to
-        <tt>1 000 000 000</tt> (all cores of all CPUs are fully in use by this
-        machine).
-      </desc>
-      <param name="user" type="unsigned long" dir="out">
-        <desc>
-          Pecentage of processor time spent executing in user mode.
-        </desc>
-      </param>
-      <param name="system" type="unsigned long" dir="out">
-        <desc>
-          Pecentage of processor time spent executing in kernel mode.
-        </desc>
-      </param>
-    </method>
-
   </interface>
 
@@ -5053 +5036 @@
     </method>
 
-    <method name="getProcessorUsage">
-      <desc>
-        Returns the processor usage by the whole host system measured over all
-        cores of all processors of the host machine.
-
-        The values returned for each parameter are in range from <tt>0</tt> (the
-        machine is powered off or doesn't load the CPUs at all) to
-        <tt>1 000 000 000</tt> (all cores of all CPUs are fully loaded by this
-        machine).
-
-        <note>
-          The maximum value is 1000000000 which means that all cores of all CPUs
-          are completely used.
-        </note>
-      </desc>
-      <param name="user" type="unsigned long" dir="out">
-        <desc>
-          Pecentage of processor time spent executing in user mode.
-        </desc>
-      </param>
-      <param name="system" type="unsigned long" dir="out">
-        <desc>
-          Pecentage of processor time spent executing in kernel mode.
-        </desc>
-      </param>
-      <param name="idle" type="unsigned long" dir="out">
-        <desc>
-          Pecentage of processor time spent doing nothing.
-        </desc>
-      </param>
-    </method>
   </interface>
 
@@ -10122 +10074 @@
 </if>
 
+  <interface
+    name="IPerformanceMetric" extends="$unknown"
+    uuid="50831d4c-ed55-4221-836c-87b487d3b44a" wsmap="managed"
+  >
+    <desc>Holds metrics parameters.</desc>
+  
+    <attribute name="metricName" type="wstring" readonly="yes">
+      <desc>
+        Name of the metric.
+      </desc>
+    </attribute>
+
+    <attribute name="object" type="$unknown" readonly="yes">
+      <desc>
+        The object this metric belongs to.
+      </desc>
+    </attribute>
+
+    <attribute name="period" type="unsigned long" readonly="yes">
+      <desc>
+        The time interval between samples, measured in seconds.
+      </desc>
+    </attribute>
+
+    <attribute name="count" type="unsigned long" readonly="yes">
+      <desc>
+        The number of recent samples retained by the collector. Older samples 
+        are discarded.
+      </desc>
+    </attribute>
+
+    <attribute name="unit" type="wstring" readonly="yes">
+      <desc>
+        The unit of measurement.
+      </desc>
+    </attribute>
+
+    <attribute name="minimumValue" type="long" readonly="yes">
+      <desc>
+        The minimum possible value of this metric.
+      </desc>
+    </attribute>
+
+    <attribute name="maximumValue" type="long" readonly="yes">
+      <desc>
+        The maximum possible value of this metric.
+      </desc>
+    </attribute>
+  </interface>
+
+  <interface
+    name="IPerformanceCollector" extends="$unknown"
+    uuid="dcd37e5a-3964-43d1-be30-0f3c7234e347"
+    wsmap="managed"
+  >
+    <desc>
+      This object collects and stores performace metrics data. Performance 
+      metrics are associated with objects like IHost and IMachine. Each object 
+      has a distict set of performance metrics. It can be obtained with
+      <link to="IPerformanceCollector::getMetrics"/>.
+    </desc>
+
+    <attribute name="metricNames" type="wstring" readonly="yes" safearray="yes">
+      <desc>
+        An array of unique names of metrics regardless of objects they are 
+        associated with.
+      </desc>
+    </attribute>
+  
+    <method name="getMetrics">
+      <desc>
+        Returns parameters (characteristics?) of specified metrics for a set of
+        objects.
+        <note>
+          Null metrics array means all metrics. Null object array means all 
+          existing objects.
+        </note>
+      </desc>
+      <param name="metricNames" type="wstring" dir="in" safearray="yes"/>
+      <param name="objects" type="$unknown" dir="in" safearray="yes"/>
+      <param name="metrics" type="IPerformanceMetric" dir="return" safearray="yes"/>
+    </method>
+  
+    <method name="setupMetrics">
+      <desc>
+        Sets parameters of specified metrics for a set of objects.
+        <note>
+          Null metrics array means all metrics. Null object array means all 
+          existing objects.
+        </note>
+      </desc>
+      <param name="metricNames" type="wstring" dir="in" safearray="yes"/>
+      <param name="objects" type="$unknown" dir="in" safearray="yes"/>
+      <param name="period" type="unsigned long" dir="in"/>
+      <param name="count" type="unsigned long" dir="in"/>
+    </method>
+
+    <method name="enableMetrics">
+      <desc>
+        Turn on collection of specified metrics.
+        <note>
+          Null metrics array means all metrics. Null object array means all 
+          existing objects.
+        </note>
+      </desc>
+      <param name="metricNames" type="wstring" dir="in" safearray="yes"/>
+      <param name="objects" type="$unknown" dir="in" safearray="yes"/>
+    </method>
+
+    <method name="disableMetrics">
+      <desc>
+        Turn off collection of specified metrics.
+        <note>
+          Null metrics array means all metrics. Null object array means all 
+          existing objects.
+        </note>
+      </desc>
+      <param name="metricNames" type="wstring" dir="in" safearray="yes"/>
+      <param name="objects" type="$unknown" dir="in" safearray="yes"/>
+    </method>
+
+    <method name="queryMetricsData">
+      <desc>
+        Queries collected metrics data for a set of objects.
+        <note>
+          Null metrics array means all applicable metrics. Null object array 
+          means all existing objects. The @a returnData parameter is a
+          flattened array of arrays. Each start and length of a sub-array is
+          indicated by @a returnDataIndices and @a returnDataLengths. The
+          rationale behind this API style is that it doesn't require objects
+          to be returned, and thus eliminates all but the unavoidable IPC.
+        </note>
+      </desc>
+      <param name="metricNames" type="wstring" dir="in" safearray="yes"/>
+      <param name="objects" type="$unknown" dir="in" safearray="yes"/>
+      <param name="returnMetricNames" type="wstring" dir="out" safearray="yes"/>
+      <param name="returnObjects" type="$unknown" dir="out" safearray="yes"/>
+      <param name="returnDataIndices" type="unsigned long" dir="out" safearray="yes"/>
+      <param name="returnDataLengths" type="unsigned long" dir="out" safearray="yes"/>
+      <param name="returnData" type="long" dir="return" safearray="yes"/>
+    </method>
+
+  </interface>
+
   <module name="VBoxSVC" context="LocalServer">
     <class name="VirtualBox" uuid="B1A7A4F2-47B9-4A1E-82B2-07CCD5323C3F"

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

@@ -36 +36 @@
 # include "win/svchlp.h"
 #endif
-
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-#include "iprt/timer.h"
-#include "iprt/system.h"
-
-/* Each second we obtain new CPU load stats. */
-#define VBOX_USAGE_SAMPLER_INTERVAL 1000
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
-
 
 class VirtualBox;
@@ -110 +101 @@
     STDMETHOD(RemoveUSBDeviceFilter) (ULONG aPosition, IHostUSBDeviceFilter **aFilter);
 
-    STDMETHOD(GetProcessorUsage) (ULONG *aUser, ULONG *aSystem, ULONG *aIdle);
-
     // public methods only for internal purposes
 
@@ -171 +160 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /** Static timer callback. */
-    static void UsageSamplerCallback (PRTTIMER pTimer, void *pvUser, uint64_t iTick);
-    /** Member timer callback. */
-    void usageSamplerCallback();
+    void registerMetrics(PerformanceCollector *collector);
+    void unregisterMetrics(PerformanceCollector *collector);
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
@@ -186 +173 @@
 #endif /* VBOX_WITH_USB */
 
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /** Pointer to the usage sampling timer. */
-    PRTTIMER mUsageSampler;
-    /** Structure to hold processor usage stats. */
-    RTCPUUSAGESTATS mCpuStats;
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 };
 

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

@@ -39 +39 @@
 #include "BIOSSettingsImpl.h"
 #include "SATAControllerImpl.h"
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+#include "PerformanceImpl.h"
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
 // generated header
@@ -48 +51 @@
 #include <iprt/thread.h>
 #include <iprt/time.h>
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-#include <iprt/system.h>
-#include <iprt/timer.h>
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
 #include <list>
@@ -169 +168 @@
         ComObjPtr <Snapshot> mCurrentSnapshot;
 
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-        /** Pointer to the usage sampling timer. */
-        PRTTIMER mUsageSampler;
-        /** Structure to hold processor usage stats. */
-        RTPROCCPUUSAGESTATS mCpuStats;
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
     };
 
@@ -530 +523 @@
     STDMETHOD(SetGuestProperty) (INPTR BSTR aKey, INPTR BSTR aValue);
 
-    STDMETHOD(GetProcessorUsage) (ULONG *user, ULONG *system);
-
     // public methods only for internal purposes
 
@@ -721 +712 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /** Static timer callback. */
-    static void UsageSamplerCallback (PRTTIMER pTimer, void *pvUser, uint64_t iTick);
-    /** Member timer callback. */
-    void usageSamplerCallback();
+    void registerMetrics(PerformanceCollector *collector);
+    void unregisterMetrics(PerformanceCollector *collector);
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 

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

@@ -36 +36 @@
 # include "win/resource.h"
 #endif
+
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+#include "PerformanceImpl.h"
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
 
 class Machine;
@@ -127 +132 @@
     STDMETHOD(COMGETTER(GuestOSTypes)) (IGuestOSTypeCollection **aGuestOSTypes);
     STDMETHOD(COMGETTER(SharedFolders)) (ISharedFolderCollection **aSharedFolders);
+    STDMETHOD(COMGETTER(PerformanceCollector)) (IPerformanceCollector **aPerformanceCollector);
 
     /* IVirtualBox methods */
@@ -345 +351 @@
     static const wchar_t *getComponentName() { return L"VirtualBox"; }
 
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+    PerformanceCollector *getCollector() { return mData.mPerformanceCollector; };
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
 private:
 
@@ -414 +424 @@
         const ComObjPtr <Host> mHost;
         const ComObjPtr <SystemProperties> mSystemProperties;
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+        const ComObjPtr <PerformanceCollector> mPerformanceCollector;
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
         CfgFile mCfgFile;

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -920 +920 @@
 
 #if 1
-    for (int i = 0; i < 10; i++)
-    {
+    {
+        Bstr metricNames[] = { L"CPU/User:avg,CPU/System:avg,CPU/Idle:avg" };
+        com::SafeArray<BSTR> metrics(1);
+        metricNames[0].detachTo(&metrics[0]);
+
         ComPtr <IHost> host;
         CHECK_RC_BREAK (virtualBox->COMGETTER(Host) (host.asOutParam()));
+        ComPtr <IPerformanceCollector> collector;
+        CHECK_RC( virtualBox->COMGETTER(PerformanceCollector)(collector.asOutParam()) );
+
+        com::SafeIfaceArray<IUnknown> objects(1);
+        host.queryInterfaceTo(&objects[0]);
+        collector->SetupMetrics(ComSafeArrayAsInParam(metrics),
+                                ComSafeArrayAsInParam(objects), 1u, 10u);
+        RTThreadSleep(3000); /* Sleep 10 seconds. */
+        /*com::SafeIfaceArray<IPerformanceData> result;
+        collector->QueryMetricsData(ComSafeArrayAsInParam(metrics),
+                                    ComSafeArrayAsInParam(objects),
+                                    ComSafeArrayAsOutParam(result));
+        for (unsigned i = 0; i < result.size(); i++)
+        {
+            Bstr metricName;
+            result[i]->COMGETTER(MetricName) (metricName.asOutParam());
+            com::SafeArray<LONG> values;
+            result[i]->COMGETTER(Values) (ComSafeArrayAsOutParam(values));
+            printf("%ls", metricName.raw());
+            for (unsigned j = 0; j < values.size(); j++)
+            {
+                printf(" %d\n", values[j]);
+            }
+        }*/
+    }
+#endif
+#if 0
+    for (int i = 0; i < 10; i++)
+    {
         ULONG user, system, idle;
         host->GetProcessorUsage(&user, &system, &idle);
         printf("user=%u system=%u idle=%u\n", user/10000000, system/10000000, idle/10000000);
-        RTThreadSleep(1000);
-    }
-#endif
-
-#if 1
+    }
+#endif
+
+#if 0
     {
         ComPtr <IMachine> machine;

trunk/src/VBox/Main/xpcom/server.cpp

@@ -189 +189 @@
 NS_DECL_CLASSINFO(SystemProperties)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SystemProperties, ISystemProperties)
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+NS_DECL_CLASSINFO(PerformanceCollector)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(PerformanceCollector, IPerformanceCollector)
+NS_DECL_CLASSINFO(PerformanceMetric)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(PerformanceMetric, IPerformanceMetric)
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 NS_DECL_CLASSINFO(BIOSSettings)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(BIOSSettings, IBIOSSettings)

trunk/src/VBox/Runtime/r3/os2/system-os2.cpp

@@ -67 +67 @@
 }
 
-RTDECL(int) RTSystemProcessorGetUsageStats(PRTCPUUSAGESTATS pStats)
-{
-    /* @todo Implement! */
-    return VERR_NOT_IMPLEMENTED;
-}
-
-RTDECL(int) RTProcessGetProcessorUsageStats(RTPROCESS pid, PRTPROCCPUUSAGESTATS pStats)
-{
-    /* @todo Implement! */
-    return VERR_NOT_IMPLEMENTED;
-}
-

trunk/src/VBox/Runtime/r3/posix/system-posix.cpp

@@ -92 +92 @@
 }
 
-/**
- * Gets the current figures of overall system processor usage.
- *
- * @remarks To get meaningful stats this function has to be
- *          called twice with a bit of delay between calls. This
- *          is due to the fact that at least two samples of
- *          system usage stats are needed to calculate the load.
- *
- * @returns None.
- */
-RTDECL(int) RTSystemProcessorGetUsageStats(PRTCPUUSAGESTATS pStats)
-{
-/** @todo r=bird: This is Linux specific and doesn't belong here. Move this to r3/linux/RTSystemGetCpuLoadStats-linux.cpp. */
-    int rc = VINF_SUCCESS;
-    uint32_t u32UserNow, u32NiceNow, u32SystemNow, u32IdleNow;
-    uint32_t u32UserDelta, u32SystemDelta, u32IdleDelta, u32BusyDelta, u32TotalDelta;
-    FILE *f = fopen("/proc/stat", "r");
-
-    if (f)
-    {
-        if (fscanf(f, "cpu %u %u %u %u", &u32UserNow, &u32NiceNow, &u32SystemNow, &u32IdleNow) == 4)
-        {
-            u32UserDelta   = (u32UserNow - pStats->u32RawUser) + (u32NiceNow - pStats->u32RawNice);
-            u32SystemDelta = u32SystemNow - pStats->u32RawSystem;
-            u32IdleDelta   = u32IdleNow - pStats->u32RawIdle;
-            u32BusyDelta   = u32UserDelta + u32SystemDelta;
-            u32TotalDelta  = u32BusyDelta + u32IdleDelta;
-            pStats->u32User   = (uint32_t)(IPRT_USAGE_MULTIPLIER * u32UserDelta / u32TotalDelta);
-            pStats->u32System = (uint32_t)(IPRT_USAGE_MULTIPLIER * u32SystemDelta / u32TotalDelta);
-            pStats->u32Idle   = (uint32_t)(IPRT_USAGE_MULTIPLIER * u32IdleDelta / u32TotalDelta);
-            /* Update the base. */
-            pStats->u32RawUser   = u32UserNow;
-            pStats->u32RawNice   = u32NiceNow;
-            pStats->u32RawSystem = u32SystemNow;
-            pStats->u32RawIdle   = u32IdleNow;
-        }
-        else
-            rc = VERR_FILE_IO_ERROR;
-        fclose(f);
-    }
-    else
-        rc = VERR_ACCESS_DENIED;
-
-    return rc;
-}
-
-/**
- * Gets the current processor usage for a partucilar process.
- *
- * @remarks To get meaningful stats this function has to be
- *          called twice with a bit of delay between calls. This
- *          is due to the fact that at least two samples of
- *          system usage stats are needed to calculate the load.
- *
- * @returns None.
- */
-RTDECL(int) RTProcessGetProcessorUsageStats(RTPROCESS pid, PRTPROCCPUUSAGESTATS pStats)
-{
-    int rc = VINF_SUCCESS;
-    uint32_t u32UserNow, u32NiceNow, u32SystemNow, u32IdleNow;
-    uint32_t u32UserDelta, u32SystemDelta;
-    uint64_t u64TotalNow, u64TotalDelta;
-
-/** @todo r=bird: This is Linux specific and doesn't belong here. Move this to r3/linux/RTSystemGetCpuLoadStats-linux.cpp. */
-    FILE *f = fopen("/proc/stat", "r");
-
-    if (f)
-    {
-        if (fscanf(f, "cpu %u %u %u %u", &u32UserNow, &u32NiceNow, &u32SystemNow, &u32IdleNow) == 4) /** @todo 'uint32_t' is not necessarily the same as 'unsigned int'. */
-        {
-            char *pszName;
-            pid_t pid2;
-            char c;
-            int iTmp;
-            unsigned uTmp;
-            unsigned long ulTmp, ulUserNow, ulSystemNow;
-            char buf[80]; /* @todo: this should be tied to max allowed proc name. */
-
-            u64TotalNow = (uint64_t)u32UserNow + u32NiceNow + u32SystemNow + u32IdleNow;
-            fclose(f);
-            RTStrAPrintf(&pszName, "/proc/%d/stat", pid);
-            //printf("Opening %s...\n", pszName);
-            f = fopen(pszName, "r");
-            RTMemFree(pszName);
-
-            if (f)
-            {
-                if (fscanf(f, "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu",
-                           &pid2, buf, &c, &iTmp, &iTmp, &iTmp, &iTmp, &iTmp, &uTmp,
-                           &ulTmp, &ulTmp, &ulTmp, &ulTmp, &ulUserNow, &ulSystemNow) == 15)
-                {
-                    Assert((pid_t)pid == pid2);
-                    u32UserDelta      = ulUserNow - pStats->u32RawProcUser;
-                    u32SystemDelta    = ulSystemNow - pStats->u32RawProcSystem;
-                    u64TotalDelta     = u64TotalNow - pStats->u64RawTotal;
-                    pStats->u32User   = (uint32_t)(IPRT_USAGE_MULTIPLIER * u32UserDelta / u64TotalDelta);
-                    pStats->u32System = (uint32_t)(IPRT_USAGE_MULTIPLIER * u32SystemDelta / u64TotalDelta);
-//                  printf("%d: user=%u%% system=%u%% / raw user=%u raw system=%u total delta=%u\n", pid,
-//                         pStats->u32User / 10000000, pStats->u32System / 10000000,
-//                         pStats->u32RawProcUser, pStats->u32RawProcSystem, u64TotalDelta);
-                    /* Update the base. */
-                    pStats->u32RawProcUser   = ulUserNow;
-                    pStats->u32RawProcSystem = ulSystemNow;
-                    pStats->u64RawTotal      = u64TotalNow;
-//                  printf("%d: updated raw user=%u raw system=%u raw total=%u\n", pid,
-//                         pStats->u32RawProcUser, pStats->u32RawProcSystem, pStats->u64RawTotal);
-                }
-                else
-                    rc = VERR_FILE_IO_ERROR;
-            }
-            else
-                rc = VERR_ACCESS_DENIED;
-        }
-        else
-            rc = VERR_FILE_IO_ERROR;
-        fclose(f);
-    }
-    else
-        rc = VERR_ACCESS_DENIED;
-
-    return rc;
-}

trunk/src/VBox/Runtime/r3/win/system-win.cpp

@@ -62 +62 @@
 }
 
-RTDECL(int) RTSystemProcessorGetUsageStats(PRTCPUUSAGESTATS pStats)
-{
-    /* @todo Implement! */
-    return VERR_NOT_IMPLEMENTED;
-}
-
-RTDECL(int) RTProcessGetProcessorUsageStats(RTPROCESS pid, PRTPROCCPUUSAGESTATS pStats)
-{
-    /* @todo Implement! */
-    return VERR_NOT_IMPLEMENTED;
-}
-