Changeset 27564 in vbox for trunk/src

Timestamp:

Mar 21, 2010 11:03:46 PM (15 years ago)

Author:

vboxsync

Message:

MediumImpl.cpp: Committed a temporary hack for the deadlock in Medium::COMSETTER(Type) while waiting for it to be fixed properly in the context of #4201.

File:

• trunk/src/VBox/Main/MediumImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1586 +1586 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+#if 1 /** @todo Temporarily hacked so that it won't trigger lock validator errors
+       *        and deadlock. */
+    /* VirtualBox::saveSettings() needs a write lock and we access mParent & children() */
+    AutoWriteLock alock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
+    AutoMultiWriteLock2 alockGrossHack(&m->pVirtualBox->getMediaTreeLockHandle(), this->lockHandle() COMMA_LOCKVAL_SRC_POS);
+#else
     /* VirtualBox::saveSettings() needs a write lock */
     AutoMultiWriteLock2 alock(m->pVirtualBox, this COMMA_LOCKVAL_SRC_POS);
+#endif
 
     switch (m->state)
@@ -1604 +1611 @@
     }
 
+#if 0 /** @todo temporary hack above. */
     /* we access mParent & children() */
     AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+#endif
 
     /* cannot change the type of a differencing hard disk */
@@ -1643 +1652 @@
 
     m->type = aType;
+
+#if 1 /** @todo remove this gross hack! Just need to get this code working again. */
+    alockGrossHack.leave();
+#endif
 
     HRESULT rc = m->pVirtualBox->saveSettings();