Changeset 25406 in vbox for trunk/include

Timestamp:

Dec 15, 2009 2:23:53 PM (15 years ago)

Author:

vboxsync

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

56035

Message:

IPRT,PDMCritSect: Lock validation can only be performed in ring-3; fixed #PF on 32-bit darwin with debug builds. Hopefully fixed the recursion issue on windows.

Location:

trunk/include/iprt

Files:

• critsect.h (modified) (1 diff)
• lockvalidator.h (modified) (5 diffs)
• thread.h (modified) (1 diff)

trunk/include/iprt/critsect.h

@@ -33 +33 @@
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
-#include <iprt/lockvalidator.h>
+#include <iprt/assert.h>
 #ifdef IN_RING3
-#include <iprt/thread.h>
+# include <iprt/thread.h>
 #endif
 

trunk/include/iprt/lockvalidator.h

@@ -34 +34 @@
 #include <iprt/types.h>
 #include <iprt/assert.h>
+#include <iprt/thread.h>
 
 
@@ -65 +66 @@
     /** Pointer to the lock record below us. Only accessed by the owner. */
     R3R0PTRTYPE(PRTLOCKVALIDATORREC)    pDown;
+    /** Recursion count */
+    uint32_t                            cRecursion;
+    /** The lock sub-class. */
+    uint32_t volatile                   uSubClass;
     /** The lock class. */
     RTLOCKVALIDATORCLASS                hClass;
-    /** The lock sub-class. */
-    uint32_t volatile                   uSubClass;
-    /** Reserved for future use. */
-    uint32_t                            u32Reserved;
     /** Pointer to the lock. */
     RTHCPTR                             hLock;
@@ -167 +168 @@
 
 /**
+ * Change the thread state to blocking and do deadlock detection.
+ *
+ * @param   pRec                The validator record we're blocing on.
+ * @param   hThread             The current thread.  Shall not be NIL_RTTHREAD!
+ * @param   enmState            The sleep state.
+ * @param   pvBlock             Pointer to a RTLOCKVALIDATORREC structure.
+ * @param   fRecursiveOk        Whether it's ok to recurse.
+ * @param   uId                 Where we are blocking.
+ * @param   RT_SRC_POS_DECL     Where we are blocking.
+ */
+RTDECL(void) RTLockValidatorCheckBlocking(PRTLOCKVALIDATORREC pRec, RTTHREAD hThread,
+                                          RTTHREADSTATE enmState, bool fRecursiveOk,
+                                          RTHCUINTPTR uId, RT_SRC_POS_DECL);
+
+/**
  * Check the exit order.
  *
@@ -189 +205 @@
 RTDECL(int)  RTLockValidatorCheckReleaseOrder(PRTLOCKVALIDATORREC pRec, RTTHREAD hThread);
 
+
 /**
  * Record the specified thread as lock owner.
@@ -226 +243 @@
 /*RTDECL(int) RTLockValidatorClassCreate();*/
 
+
 RT_C_DECLS_END
 

trunk/include/iprt/thread.h

@@ -649 +649 @@
 
 /**
- * Change the thread state to blocking and do deadlock detection.
- *
- * This is a RT_STRICT method for debugging locks and detecting deadlocks.
- *
- * @param   hThread         The current thread.
- * @param   enmState        The sleep state.
- * @param   pvBlock         Pointer to a RTLOCKVALIDATORREC structure.
- * @param   fRecursiveOk    Whether it's ok to recurse.
- * @param   uId             Where we are blocking.
- * @param   RT_SRC_POS_DECL Where we are blocking.
- *
- * @todo    Move this to RTLockValidator.
- */
-RTDECL(void) RTThreadBlockingDebug(RTTHREAD hThread, RTTHREADSTATE enmState, bool fRecursiveOk,
-                                   PRTLOCKVALIDATORREC pValidatorRec, RTHCUINTPTR uId, RT_SRC_POS_DECL);
+ * Translate a thread state into a string.
+ *
+ * @returns Pointer to a read-only string containing the state name.
+ * @param   enmState            The state.
+ */
+RTDECL(const char *) RTThreadStateName(RTTHREADSTATE enmState);