Changeset 38717 in vbox for trunk/include/VBox/com

Timestamp:

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

Author:

vboxsync

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/include/VBox/com/AutoLock.h (modified) (2 diffs)

trunk/include/VBox/com/AutoLock.h

@@ -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
@@ -76 +76 @@
     LOCKCLASS_LISTOFMEDIA = 7,              // list of media (hard disks, DVDs, floppies) in VirtualBox object
     LOCKCLASS_LISTOFOTHEROBJECTS = 8,       // any other list of objects
-    LOCKCLASS_OTHEROBJECT = 9,              // any regular object member variable lock
-    LOCKCLASS_USBLIST = 10,                 // temporary hack to avoid having to clean up the USB filters
+    LOCKCLASS_MEDIUMQUERY = 9,              // lock used to protect Machine::queryInfo
+    LOCKCLASS_OTHEROBJECT = 10,             // any regular object member variable lock
+    LOCKCLASS_USBLIST = 11,                 // temporary hack to avoid having to clean up the USB filters
                                             // too much @todo r=dj get rid of this!
-    LOCKCLASS_PROGRESSLIST = 11,            // list of progress objects in VirtualBox; no other object lock
+    LOCKCLASS_PROGRESSLIST = 12,            // list of progress objects in VirtualBox; no other object lock
                                             // may be held after this!
-    LOCKCLASS_OBJECTSTATE = 12              // object state lock (handled by AutoCaller classes)
+    LOCKCLASS_OBJECTSTATE = 13              // object state lock (handled by AutoCaller classes)
 };