Changeset 38717 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Sep 12, 2011 2:48:50 PM (14 years ago)

Author:

vboxsync

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

73975

Message:

Main/Medium+Machine+AutoLock: Integrate the queryInfo semaphore into the AutoLock infrastructure with the appropriate lock class. Adjust the locking rules for queryInfo and start propagating them up to the callers. Needs more work, but this is comparably simple: just get the mediaTree lock in the caller if the assert triggers.

File:

• trunk/src/VBox/Main/glue/AutoLock.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -73 +73 @@
         { LOCKCLASS_LISTOFMEDIA,        "7-LISTOFMEDIA" },
         { LOCKCLASS_LISTOFOTHEROBJECTS, "8-LISTOFOTHEROBJECTS" },
-        { LOCKCLASS_OTHEROBJECT,        "9-OTHEROBJECT" },
-        { LOCKCLASS_USBLIST,            "10-USBLIST" },
-        { LOCKCLASS_PROGRESSLIST,       "11-PROGRESSLIST" },
-        { LOCKCLASS_OBJECTSTATE,        "12-OBJECTSTATE" }
+        { LOCKCLASS_MEDIUMQUERY,        "9-MEDIUMQUERY" },
+        { LOCKCLASS_OTHEROBJECT,        "10-OTHEROBJECT" },
+        { LOCKCLASS_USBLIST,            "11-USBLIST" },
+        { LOCKCLASS_PROGRESSLIST,       "12-PROGRESSLIST" },
+        { LOCKCLASS_OBJECTSTATE,        "13-OBJECTSTATE" }
     };