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

Timestamp:

Aug 26, 2008 5:40:41 PM (16 years ago)

Author:

vboxsync

Message:

PerfAPI: Duplicate VM entries fix

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7626 +7626 @@
 };
 
-void Machine::unregisterMetrics (PerformanceCollector *aCollector)
-{
-    aCollector->unregisterMetricsFor (this);
-    aCollector->unregisterBaseMetricsFor (this);
+void Machine::unregisterMetrics (PerformanceCollector *aCollector, Machine *aMachine)
+{
+    aCollector->unregisterMetricsFor (aMachine);
+    aCollector->unregisterBaseMetricsFor (aMachine);
 };
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
@@ -7925 +7925 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-    unregisterMetrics (mParent->performanceCollector());
+    unregisterMetrics (mParent->performanceCollector(), mPeer);
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 

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

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