Changeset 40506 in vbox for trunk

Timestamp:

Mar 16, 2012 5:05:32 PM (13 years ago)

Author:

vboxsync

Message:

Main/Medium: Hopefully final go at holding the Medium object lock as briefly as possible. Previously the code was simpler, but held the lock over long operations such as opening images, and this caused e.g. slow GUI startup time.

File:

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

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

@@ -5408 +5408 @@
      * of the method), then queryInfoSem, and below the other way round. */
     AutoWriteLock qlock(m->queryInfoSem COMMA_LOCKVAL_SRC_POS);
-    alock.acquire();
 
     try
@@ -5446 +5445 @@
                 if (fSetImageId)
                 {
+                    alock.acquire();
                     vrc = VDSetUuid(hdd, 0, m->uuidImage.raw());
+                    alock.release();
                     ComAssertRCThrow(vrc, E_FAIL);
                     mediumId = m->uuidImage;
@@ -5452 +5453 @@
                 if (fSetParentId)
                 {
+                    alock.acquire();
                     vrc = VDSetParentUuid(hdd, 0, m->uuidParentImage.raw());
+                    alock.release();
                     ComAssertRCThrow(vrc, E_FAIL);
                 }
                 /* zap the information, these are no long-term members */
+                alock.acquire();
                 unconst(m->uuidImage).clear();
                 unconst(m->uuidParentImage).clear();
+                alock.release();
 
                 /* check the UUID */
@@ -5497 +5502 @@
                 {
                     /* set the UUID if an API client wants to change it */
+                    alock.acquire();
                     mediumId = m->uuidImage;
+                    alock.release();
                 }
                 else if (isImport)
@@ -5510 +5517 @@
             vrc = VDGetImageFlags(hdd, 0, &uImageFlags);
             ComAssertRCThrow(vrc, E_FAIL);
+            alock.acquire();
             m->variant = (MediumVariant_T)uImageFlags;
+            alock.release();
 
             /* check/get the parent uuid and update corresponding state */
@@ -5547 +5556 @@
 
                     /* we set mParent & children() */
-                    alock.release();
                     treeLock.acquire();
 
@@ -5555 +5563 @@
 
                     treeLock.release();
-                    alock.acquire();
                 }
                 else
                 {
                     /* we access mParent */
-                    alock.release();
                     treeLock.acquire();
 
@@ -5585 +5591 @@
                                 m->pVirtualBox->settingsFilePath().c_str());
                         treeLock.release();
-                        alock.acquire();
                         throw S_OK;
 #endif /* 0 */
@@ -5604 +5609 @@
                             parentLock.release();
                             treeLock.release();
-                            alock.acquire();
                             throw S_OK;
                         }
@@ -5614 +5618 @@
 
                     treeLock.release();
-                    alock.acquire();
                 }
             }
@@ -5642 +5645 @@
     }
 
-    alock.release();
     treeLock.acquire();
     alock.acquire();