Changeset 30055 in vbox for trunk

Timestamp:

Jun 7, 2010 8:27:00 AM (15 years ago)

Author:

vboxsync

Message:

VBoxSVC: Lock order fixes (+assert) for weird shutdown case where we have to clean up a SessionMachine or two. Needs reviewing.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (1 diff)
• glue/ErrorInfo.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -9754 +9754 @@
     mData.free();
 
+#if 1 /** @todo Please review this change! (bird) */
+    /* drop the exclusive lock before setting the below two to NULL */
+    multilock.release();
+#else
     /* leave the exclusive lock before setting the below two to NULL */
     multilock.leave();
+#endif
 
     unconst(mParent) = NULL;

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -691 +691 @@
 
     LogFlowThisFunc(("Uninitializing machines (%d)...\n", m->ollMachines.size()));
-    m->ollMachines.uninitAll();
+    if (m->pHost)
+    {
+        /* It is necessary to hold the VirtualBox and Host locks here because
+           we may have to uninitialize SessionMachines. */
+        AutoMultiWriteLock2 multilock(this, m->pHost COMMA_LOCKVAL_SRC_POS);
+        m->ollMachines.uninitAll();
+    }
+    else
+        m->ollMachines.uninitAll();
     m->ollFloppyImages.uninitAll();
     m->ollDVDImages.uninitAll();

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -135 +135 @@
         }
     }
+    /* Ignore failure when called after nsComponentManagerImpl::Shutdown(). */
+    else if (rc == NS_ERROR_UNEXPECTED)
+        rc = NS_OK;
 
     AssertComRC (rc);