Changeset 30958 in vbox

Timestamp:

Jul 21, 2010 1:17:18 PM (15 years ago)

Author:

vboxsync

Message:

Main/Machine: Move registering the metrics for running VMs from opening the session (too early) to the time when the VM has been actually powered on. Avoids a complicated cross-process deadlock without actually losing functionality.

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -5321 +5321 @@
     if (SUCCEEDED(rc))
     {
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-        registerMetrics(mParent->performanceCollector(), this, pid);
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
-
         /*
          *  Set the session state to Spawning to protect against subsequent
@@ -9949 +9945 @@
         mData->mSession.mProgress->notifyComplete((HRESULT)iResult);
         mData->mSession.mProgress.setNull();
+
+        if (SUCCEEDED((HRESULT)iResult))
+        {
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+            /* The VM has been powered up successfully, so it makes sense
+             * now to offer the performance metrics for a running machine
+             * object. Doing it earlier wouldn't be safe. */
+            registerMetrics(mParent->performanceCollector(), mPeer,
+                            mData->mSession.mPid);
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
+        }
     }
     return S_OK;