Changeset 31327 in vbox

Timestamp:

Aug 3, 2010 10:34:16 AM (14 years ago)

Author:

vboxsync

Message:

Main: fix locking order violations introduced by r64323 by using a new, separate lock for the host drives

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (10 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -159 +159 @@
           usbListsLock(LOCKCLASS_USBLIST),
 #endif
+          drivesLock(LOCKCLASS_LISTOFMEDIA),
           fDVDDrivesListBuilt(false),
           fFloppyDrivesListBuilt(false)
@@ -176 +177 @@
 
     // list of host drives; lazily created by getDVDDrives() and getFloppyDrives()
+    WriteLockHandle         drivesLock;                 // protects the below two lists and the bools
     MediaList               llDVDDrives,
                             llFloppyDrives;
@@ -416 +418 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock alock(m->drivesLock COMMA_LOCKVAL_SRC_POS);
 
     MediaList *pList;
@@ -442 +444 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock alock(m->drivesLock COMMA_LOCKVAL_SRC_POS);
 
     MediaList *pList;
@@ -1527 +1529 @@
  * that may have changed if fRefresh == true.
  *
- * The caller must hold the Host write lock before calling this.
+ * The caller must hold the m->drivesLock write lock before calling this.
  * To protect the list to which the caller's pointer points, the caller
- * must also hold the Host lock.
+ * must also hold that lock.
  *
  * @param mediumType Must be DeviceType_Floppy or DeviceType_DVD.
@@ -1541 +1543 @@
 {
     HRESULT rc = S_OK;
-    Assert(isWriteLockOnCurrentThread());
+    Assert(m->drivesLock.isWriteLockOnCurrentThread());
 
     MediaList llNew;
@@ -1650 +1652 @@
  * and looks for a host drive with the given UUID. If found, it sets pMedium
  * to that drive; otherwise returns VBOX_E_OBJECT_NOT_FOUND.
+ *
  * @param mediumType Must be DeviceType_DVD or DeviceType_Floppy.
  * @param uuid Medium UUID of host drive to look for.
@@ -1663 +1666 @@
     MediaList *pllMedia;
 
-    AutoWriteLock wlock(this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock wlock(m->drivesLock COMMA_LOCKVAL_SRC_POS);
     HRESULT rc = getDrives(mediumType, fRefresh, pllMedia);
     if (SUCCEEDED(rc))
@@ -1692 +1695 @@
     HRESULT rc = S_OK;
 
-    Assert(isWriteLockOnCurrentThread());
+    Assert(m->drivesLock.isWriteLockOnCurrentThread());
 
     try
@@ -1809 +1812 @@
     HRESULT rc = S_OK;
 
-    Assert(isWriteLockOnCurrentThread());
+    Assert(m->drivesLock.isWriteLockOnCurrentThread());
 
     try