Changeset 25836 in vbox

Timestamp:

Jan 14, 2010 4:44:46 PM (15 years ago)

Author:

vboxsync

Message:

Main: locking order fixes; GUI comes up now with strict locking enabled

Location:

trunk

Files:

• include/VBox/com/AutoLock.h (modified) (1 diff)
• src/VBox/Main/HostImpl.cpp (modified) (1 diff)
• src/VBox/Main/MediumImpl.cpp (modified) (2 diffs)
• src/VBox/Main/glue/AutoLock.cpp (modified) (1 diff)
• src/VBox/Main/include/SnapshotImpl.h (modified) (2 diffs)

trunk/include/VBox/com/AutoLock.h

@@ -66 +66 @@
     LOCKCLASS_USBPROXYSERVICE = 3,          // USB proxy service object lock
     LOCKCLASS_HOSTOBJECT = 4,               // Host object lock
-    LOCKCLASS_HOSTLIST = 5,                 // lock protecting a list in Host object
-    LOCKCLASS_OTHEROBJECT = 6,              // any regular object member variable lock
-    LOCKCLASS_OTHERLIST = 7,                // lock protecting a list that's elsewhere
+    LOCKCLASS_OTHEROBJECT = 5,              // any regular object member variable lock
+    LOCKCLASS_OTHERLIST = 6,                // lock protecting a list that's elsewhere
                                             // (e.g. snapshots list in machine object)
-    LOCKCLASS_OBJECTSTATE = 8               // object state lock (handled by AutoCaller classes)
+    LOCKCLASS_SNAPSHOTOBJECT = 7,           // snapshot object locks (need to have lower order
+                                            // than both OTHEROBJECT and OTHERLIST since the list
+                                            // of snapshots in Machine is OTHERLIST)
+    LOCKCLASS_USBLIST = 8,                  // temporary hack to avoid having to clean up the USB filters
+                                            // too much @todo r=dj get rid of this!
+    LOCKCLASS_OBJECTSTATE = 9               // object state lock (handled by AutoCaller classes)
 };
 

trunk/src/VBox/Main/HostImpl.cpp

@@ -152 +152 @@
     Data()
 #ifdef VBOX_WITH_USB
-        : usbListsLock(LOCKCLASS_HOSTLIST)
+        : usbListsLock(LOCKCLASS_USBLIST)
 #endif
     {};

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1657 +1657 @@
         if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
         /* we access mParent */
         AutoReadLock treeLock(m->pVirtualBox->hardDiskTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
         if (m->pParent.isNull())
@@ -3008 +3008 @@
     AssertComRCReturn(autoCaller.rc(), false);
 
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     /* we access children */
     AutoReadLock treeLock(m->pVirtualBox->hardDiskTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     switch (m->type)

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

@@ -74 +74 @@
         { LOCKCLASS_USBPROXYSERVICE,  "3-USBPROXYSERVICE" },
         { LOCKCLASS_HOSTOBJECT,       "4-HOSTOBJECT" },
-        { LOCKCLASS_HOSTLIST,         "5-HOSTLIST" },
-        { LOCKCLASS_OTHEROBJECT,      "6-OTHEROBJECT" },
-        { LOCKCLASS_OTHERLIST,        "7-OTHERLIST" },
-        { LOCKCLASS_OBJECTSTATE,      "8-OBJECTSTATE" }
+        { LOCKCLASS_OTHEROBJECT,      "5-OTHEROBJECT" },
+        { LOCKCLASS_OTHERLIST,        "6-OTHERLIST" },
+        { LOCKCLASS_SNAPSHOTOBJECT,   "7-SNAPSHOTOBJECT" },
+        { LOCKCLASS_USBLIST,          "8-USBLIST" },
+        { LOCKCLASS_OBJECTSTATE,      "9-OBJECTSTATE" }
     };
 

trunk/src/VBox/Main/include/SnapshotImpl.h

@@ -91 +91 @@
     // public methods only for internal purposes
 
-
     /**
      * Simple run-time type identification without having to enable C++ RTTI.
@@ -100 +99 @@
     {
         return clsidSnapshot;
+    }
+
+    /**
+     * Override of the default locking class to be used for validating lock
+     * order with the standard member lock handle.
+     */
+    virtual VBoxLockingClass getLockingClass() const
+    {
+        return LOCKCLASS_SNAPSHOTOBJECT;
     }