Changeset 25880 in vbox for trunk/src/VBox

Timestamp:

Jan 18, 2010 11:26:35 AM (15 years ago)

Author:

vboxsync

Message:

Main: more locking order validation fixes

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (2 diffs)
• glue/AutoLock.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -97 +97 @@
 
 Machine::Data::Data()
-    : mSnapshotsTreeLockHandle(LOCKCLASS_MACHINELIST)
+    : mSnapshotsTreeLockHandle(LOCKCLASS_LISTOFSNAPSHOTS)
 {
     mRegistered = FALSE;
@@ -6133 +6133 @@
     HRESULT rc = S_OK;
 
-    /* Make sure the attached hard disks don't get unregistered until we
-     * associate them with tis machine (important for VMs loaded (opened) after
-     * VirtualBox startup) */
-    AutoReadLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-
     for (settings::StorageControllersList::const_iterator it = data.llStorageControllers.begin();
          it != data.llStorageControllers.end();

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -175 +175 @@
     Data()
         : pMainConfigFile(NULL),
-          ollMachines(LOCKCLASS_VIRTUALBOXLIST),
-          ollGuestOSTypes(LOCKCLASS_VIRTUALBOXLIST),
-          ollHardDisks(LOCKCLASS_VIRTUALBOXLIST),
-          ollDVDImages(LOCKCLASS_VIRTUALBOXLIST),
-          ollFloppyImages(LOCKCLASS_VIRTUALBOXLIST),
-          ollSharedFolders(LOCKCLASS_VIRTUALBOXLIST),
-          ollDHCPServers(LOCKCLASS_VIRTUALBOXLIST),
+          ollMachines(LOCKCLASS_LISTOFMACHINES),
+          ollGuestOSTypes(LOCKCLASS_LISTOFOTHEROBJECTS),
+          ollHardDisks(LOCKCLASS_LISTOFMEDIA),
+          ollDVDImages(LOCKCLASS_LISTOFMEDIA),
+          ollFloppyImages(LOCKCLASS_LISTOFMEDIA),
+          ollSharedFolders(LOCKCLASS_LISTOFOTHEROBJECTS),
+          ollDHCPServers(LOCKCLASS_LISTOFOTHEROBJECTS),
           mtxProgressOperations(LOCKCLASS_PROGRESSLIST),
           updateReq(UPDATEREQARG),
@@ -3658 +3658 @@
     AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
-    ObjectsList<Medium> ollAll(LOCKCLASS_VIRTUALBOXLIST);
+    ObjectsList<Medium> ollAll(LOCKCLASS_LISTOFMEDIA);
     ollAll.appendOtherList(m->ollDVDImages);
     ollAll.appendOtherList(m->ollFloppyImages);

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

@@ -70 +70 @@
     } aClasses[] =
     {
-        { LOCKCLASS_VIRTUALBOXOBJECT, "1-VIRTUALBOXOBJECT" },
-        { LOCKCLASS_VIRTUALBOXLIST,   "2-VIRTUALBOXLIST" },
-        { LOCKCLASS_USBPROXYSERVICE,  "3-USBPROXYSERVICE" },
-        { LOCKCLASS_HOSTOBJECT,       "4-HOSTOBJECT" },
-        { LOCKCLASS_MACHINEOBJECT,    "5-MACHINEOBJECT" },
-        { LOCKCLASS_MACHINELIST,      "6-MACHINELIST" },
-        { LOCKCLASS_SNAPSHOTOBJECT,   "7-SNAPSHOTOBJECT" },
-        { LOCKCLASS_OTHEROBJECT,      "8-OTHEROBJECT" },
-        { LOCKCLASS_USBLIST,          "9-USBLIST" },
-        { LOCKCLASS_PROGRESSLIST,     "10-PROGRESSLIST" },
-        { LOCKCLASS_OBJECTSTATE,      "11-OBJECTSTATE" }
+        { LOCKCLASS_VIRTUALBOXOBJECT,   "1-VIRTUALBOXOBJECT" },
+        { LOCKCLASS_USBPROXYSERVICE,    "2-USBPROXYSERVICE" },
+        { LOCKCLASS_HOSTOBJECT,         "3-HOSTOBJECT" },
+        { LOCKCLASS_LISTOFMACHINES,     "4-LISTOFMACHINES" },
+        { LOCKCLASS_MACHINEOBJECT,      "5-MACHINEOBJECT" },
+        { LOCKCLASS_LISTOFSNAPSHOTS,    "6-LISTOFSNAPSHOTS" },
+        { LOCKCLASS_SNAPSHOTOBJECT,     "7-SNAPSHOTOBJECT" },
+        { LOCKCLASS_LISTOFMEDIA,        "8-LISTOFMEDIA" },
+        { LOCKCLASS_LISTOFOTHEROBJECTS, "9-LISTOFOTHEROBJECTS" },
+        { LOCKCLASS_OTHEROBJECT,        "10-OTHEROBJECT" },
+        { LOCKCLASS_USBLIST,            "11-USBLIST" },
+        { LOCKCLASS_PROGRESSLIST,       "12-PROGRESSLIST" },
+        { LOCKCLASS_OBJECTSTATE,        "13-OBJECTSTATE" }
     };