Changeset 38741 in vbox

Timestamp:

Sep 13, 2011 2:47:57 PM (14 years ago)

Author:

vboxsync

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

74012

Message:

Main/Medium: all remaining changes to get the media tree lock order issues sorted in this file (I hope).

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (5 diffs)

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

@@ -2647 +2647 @@
     {
         // locking: we need the tree lock first because we access parent pointers
-        AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
         // and we need to write-lock the media involved
-        AutoMultiWriteLock3 alock(this, pTarget, pParent COMMA_LOCKVAL_SRC_POS);
+        AutoMultiWriteLock4 alock(&m->pVirtualBox->getMediaTreeLockHandle(),
+                                  this->lockHandle(),
+                                  pTarget->lockHandle(),
+                                  pParent->LockHandle() COMMA_LOCKVAL_SRC_POS);
 
         if (    pTarget->m->state != MediumState_NotCreated
@@ -4398 +4400 @@
     {
         // locking: we need the tree lock first because we access parent pointers
-        AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+        AutoWriteLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
 
         /* more sanity checking and figuring out the merge direction */
@@ -4977 +4979 @@
     {
         // locking: we need the tree lock first because we access parent pointers
-        AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
         // and we need to write-lock the media involved
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+        AutoMultiWriteLock2 alock(&m->pVirtualBox->getMediaTreeLockHandle(),
+                                  this->lockHandle() COMMA_LOCKVAL_SRC_POS);
 
         /* Build the source lock list. */
@@ -5056 +5058 @@
     {
         // locking: we need the tree lock first because we access parent pointers
-        AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
         // and we need to write-lock the media involved
-        AutoMultiWriteLock2 alock(this, aParent COMMA_LOCKVAL_SRC_POS);
+        AutoMultiWriteLock3 alock(&m->pVirtualBox->getMediaTreeLockHandle(),
+                                 this->lockHandle(),
+                                 aParent->lockHandle() COMMA_LOCKVAL_SRC_POS);
 
         if (   m->state != MediumState_NotCreated
@@ -5143 +5146 @@
     {
         // locking: we need the tree lock first because we access parent pointers
-        AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
         // and we need to write-lock the media involved
-        AutoMultiWriteLock3 alock(this, aTarget, aParent COMMA_LOCKVAL_SRC_POS);
+        AutoMultiWriteLock4 alock(&m->pVirtualBox->getMediaTreeLockHandle(),
+                                  this->lockHandle(),
+                                  aTarget->lockHandle(),
+                                  aParent->lockHandle() COMMA_LOCKVAL_SRC_POS);
 
         if (    aTarget->m->state != MediumState_NotCreated