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

Timestamp:

Aug 12, 2008 2:02:08 PM (16 years ago)

Author:

vboxsync

Message:

PerfAPI: Important! VM metrics are now associated with Machine instead of SessionMachine.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (3 diffs)
• include/MachineImpl.h (modified) (1 diff)
• testcase/tstAPI.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7579 +7579 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-void Machine::registerMetrics (PerformanceCollector *aCollector, RTPROCESS pid)
+void Machine::registerMetrics (PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid)
 {
     pm::MetricFactory *metricFactory = aCollector->getMetricFactory();
@@ -7589 +7589 @@
     IUnknown *objptr;
 
-    ComObjPtr<Machine> tmp = this;
+    ComObjPtr<Machine> tmp = aMachine;
     tmp.queryInterfaceTo (&objptr);
     pm::BaseMetric *cpuLoad =
@@ -7845 +7845 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-    registerMetrics (mParent->performanceCollector(), mData->mSession.mPid);
+    registerMetrics (mParent->performanceCollector(), aMachine, mData->mSession.mPid);
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 

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

@@ -736 +736 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-    void registerMetrics (PerformanceCollector *aCollector, RTPROCESS pid);
+    void registerMetrics (PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid);
     void unregisterMetrics (PerformanceCollector *aCollector);
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */

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

@@ -966 +966 @@
         com::SafeIfaceArray<IUnknown> objects(2);
         host.queryInterfaceTo(&objects[0]);
-        sessionMachine.queryInterfaceTo(&objects[1]);
+        machine.queryInterfaceTo(&objects[1]);
         CHECK_ERROR_BREAK (collector, SetupMetrics(ComSafeArrayAsInParam(baseMetrics),
                                                    ComSafeArrayAsInParam(objects), 1u, 10u) );