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

Timestamp:

Jan 14, 2010 4:21:05 PM (15 years ago)

Author:

vboxsync

Message:

Main: finish integration of Main lock validation with IPRT; only enabled with VBOX_WITH_STRICT_LOCKS=1 (do NOT enable unless you want Main to stop working now)

File:

• trunk/include/VBox/com/AutoLock.h (modified) (8 diffs)

trunk/include/VBox/com/AutoLock.h

@@ -27 +27 @@
 // macros for automatic lock validation; these will amount to nothing
 // unless lock validation is enabled for the runtime
-#if defined(RT_LOCK_STRICT)
+#if defined(RT_LOCK_STRICT) && defined (DEBUG)
+#define VBOX_WITH_MAIN_LOCK_VALIDATION
 # define COMMA_LOCKVAL_SRC_POS , RT_SRC_POS
 # define LOCKVAL_SRC_POS_DECL RT_SRC_POS_DECL
@@ -57 +58 @@
  * LockHandle classes.
  */
-enum MainLockValidationClasses
+enum VBoxLockingClass
 {
     LOCKCLASS_NONE = 0,
@@ -63 +64 @@
     LOCKCLASS_VIRTUALBOXLIST = 2,           // lock protecting a list in VirtualBox object
                                             // (machines list, hard disk tree, shared folders list, ...)
-    LOCKCLASS_OTHERLIST = 3,                // lock protecting a list that's elsewhere
+    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
                                             // (e.g. snapshots list in machine object)
-    LOCKCLASS_OBJECT = 4,                   // any regular object member variable  lock
-    LOCKCLASS_OBJECTSTATE = 5               // object state lock (handled by AutoCaller classes)
+    LOCKCLASS_OBJECTSTATE = 8               // object state lock (handled by AutoCaller classes)
 };
 
@@ -111 +115 @@
     virtual void unlockRead() = 0;
 
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     virtual const char* describe() const = 0;
 #endif
@@ -132 +136 @@
 {
 public:
-    RWLockHandle(MainLockValidationClasses lockClass);
+    RWLockHandle(VBoxLockingClass lockClass);
     virtual ~RWLockHandle();
 
@@ -144 +148 @@
     virtual uint32_t writeLockLevel() const;
 
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     virtual const char* describe() const;
 #endif
@@ -169 +173 @@
 {
 public:
-    WriteLockHandle(MainLockValidationClasses lockClass);
+    WriteLockHandle(VBoxLockingClass lockClass);
     virtual ~WriteLockHandle();
     virtual bool isWriteLockOnCurrentThread() const;
@@ -179 +183 @@
     virtual uint32_t writeLockLevel() const;
 
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     virtual const char* describe() const;
 #endif