Changeset 30882 in vbox

Timestamp:

Jul 16, 2010 3:20:43 PM (14 years ago)

Author:

vboxsync

Message:

Main/Machine+VirtualBox: add missing synchronization to the delayed unregistration of VM metrics, and make it bullet proof.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -9171 +9171 @@
 void Machine::registerMetrics(PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid)
 {
+    AssertReturnVoid(isWriteLockOnCurrentThread());
+    AssertPtrReturnVoid(aCollector);
+
     pm::CollectorHAL *hal = aCollector->getHAL();
     /* Create sub metrics */
@@ -9287 +9290 @@
 void Machine::unregisterMetrics(PerformanceCollector *aCollector, Machine *aMachine)
 {
-    aCollector->unregisterMetricsFor(aMachine);
-    aCollector->unregisterBaseMetricsFor(aMachine);
+    AssertReturnVoid(isWriteLockOnCurrentThread());
+
+    if (aCollector)
+    {
+        aCollector->unregisterMetricsFor(aMachine);
+        aCollector->unregisterBaseMetricsFor(aMachine);
+    }
 
     if (mGuestHAL)
+    {
         delete mGuestHAL;
+        mGuestHAL = NULL;
+    }
 }
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -2723 +2723 @@
          * it done immediately. It reduces the number of locks needed and
          * the lock contention in SessionMachine::uninit. */
-        mMachine->unregisterMetrics(mVirtualBox->performanceCollector(), mMachine);
+        {
+            AutoWriteLock mLock(mMachine COMMA_LOCKVAL_SRC_POS);
+            mMachine->unregisterMetrics(mVirtualBox->performanceCollector(), mMachine);
+        }
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */