Changeset 39221 in vbox

Timestamp:

Nov 8, 2011 6:08:59 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74743

Message:

Main/metrics: unregister guest after metrics (#5949)

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -11013 +11013 @@
     AutoMultiWriteLock3 multilock(mParent, mParent->host(), this COMMA_LOCKVAL_SRC_POS);
 
-    LogAleksey(("{%p} " LOG_FN_FMT ": mCollectorGuest=%p\n",
-                this, __PRETTY_FUNCTION__, mCollectorGuest));
-    if (mCollectorGuest)
-    {
-        mParent->performanceCollector()->unregisterGuest(mCollectorGuest);
-        // delete mCollectorGuest; => CollectorGuestManager::destroyUnregistered()
-        mCollectorGuest = NULL;
-    }
 #if 0
     // Trigger async cleanup tasks, avoid doing things here which are not
@@ -11034 +11026 @@
     unregisterMetrics(mParent->performanceCollector(), mPeer);
 #endif
+    /* The guest must be unregistered after its metrics (#5949). */
+    LogAleksey(("{%p} " LOG_FN_FMT ": mCollectorGuest=%p\n",
+                this, __PRETTY_FUNCTION__, mCollectorGuest));
+    if (mCollectorGuest)
+    {
+        mParent->performanceCollector()->unregisterGuest(mCollectorGuest);
+        // delete mCollectorGuest; => CollectorGuestManager::destroyUnregistered()
+        mCollectorGuest = NULL;
+    }
 
     if (aReason == Uninit::Abnormal)