Changeset 25736 in vbox

Timestamp:

Jan 11, 2010 5:16:46 PM (15 years ago)

Author:

vboxsync

Message:

Main: Forward locking location info to the IPRT API. Added a todo with some hints about how to go about implementing locking ordering.

File:

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

trunk/src/VBox/Main/AutoLock.cpp

@@ -252 +252 @@
 {
     m = new Data();
+/** @todo Lock order validation: There are two options here:
+ *  -# Use one RTLOCKVALCLASS (share it with WriteLockHandle) and then use
+ *     sub-classes (integers) to deal with lock ordering.
+ *  -# Use different classes (RTLOCKVALCLASS) for each object and only use
+ *     sub-classes to deal with things like the media tree.
+ */
+
     int vrc = RTSemRWCreate(&m->sem);
     AssertRC(vrc);
@@ -276 +283 @@
     validateLock(LOCKVAL_SRC_POS_ARGS);
 #endif
+#if defined(RT_STRICT) && defined(VBOX_WITH_DEBUG_LOCK_VALIDATOR)
+    int vrc = RTSemRWRequestWriteDebug(m->sem, RT_INDEFINITE_WAIT, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
+#elif defined(RT_STRICT)
+    int vrc = RTSemRWRequestWriteDebug(m->sem, RT_INDEFINITE_WAIT, (uintptr_t)ASMReturnAddress(), RT_SRC_POS);
+#else
     int vrc = RTSemRWRequestWrite(m->sem, RT_INDEFINITE_WAIT);
+#endif
     AssertRC(vrc);
 }
@@ -295 +308 @@
     validateLock(LOCKVAL_SRC_POS_ARGS);
 #endif
+#if defined(RT_STRICT) && defined(VBOX_WITH_DEBUG_LOCK_VALIDATOR)
+    int vrc = RTSemRWRequestReadDebug(m->sem, RT_INDEFINITE_WAIT, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
+#elif defined(RT_STRICT)
+    int vrc = RTSemRWRequestReadDebug(m->sem, RT_INDEFINITE_WAIT, (uintptr_t)ASMReturnAddress(), RT_SRC_POS);
+#else
     int vrc = RTSemRWRequestRead(m->sem, RT_INDEFINITE_WAIT);
+#endif
     AssertRC(vrc);
 }
@@ -310 +329 @@
 /*virtual*/ uint32_t RWLockHandle::writeLockLevel() const
 {
+    /* Note! This does not include read recursions done by the writer! */
     return RTSemRWGetWriteRecursion(m->sem);
 }