Changeset 25406 in vbox for trunk/src/VBox/Runtime/include

Timestamp:

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

Author:

vboxsync

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/src/VBox/Runtime/include/internal

Files:

• lockvalidator.h (added)
• strict.h (modified) (5 diffs)
• thread.h (modified) (4 diffs)

trunk/src/VBox/Runtime/include/internal/strict.h

@@ -38 +38 @@
  * Enables strictness checks and lock accounting of the RTCritSect API.
  */
-#if defined(DOXYGEN_RUNNING) || (!defined(RTCRITSECT_STRICT) && (defined(RT_STRICT) || defined(RT_LOCK_STRICT)))
+#if defined(DOXYGEN_RUNNING) || (!defined(RTCRITSECT_STRICT) && defined(IN_RING3) && (defined(RT_STRICT) || defined(RT_LOCK_STRICT)))
 # define RTCRITSECT_STRICT
 #endif
@@ -46 +46 @@
 # define RTCRITSECT_STRICT_POS_ARGS             uId, RT_SRC_POS_ARGS
 # define RTCRITSECT_STRICT_BLOCK(hThread, pRec, fRecursive) \
-                                                RTThreadBlockingDebug((hThread), RTTHREADSTATE_CRITSECT, fRecursive, pRec, uId, RT_SRC_POS_ARGS)
+                                                RTLockValidatorCheckBlocking(pRec, (hThread), RTTHREADSTATE_CRITSECT, fRecursive, uId, RT_SRC_POS_ARGS)
 #else
 # define RTCRITSECT_STRICT_POS_DECL             int iDummy
@@ -59 +59 @@
  * Enables strictness checks and lock accounting of the RTSemMutex API.
  */
-#if defined(DOXYGEN_RUNNING) || (!defined(RTSEMMUTEX_STRICT) && (defined(RT_STRICT) || defined(RT_LOCK_STRICT) || defined(RTSEM_STRICT)))
+#if defined(DOXYGEN_RUNNING) || (!defined(RTSEMMUTEX_STRICT) && defined(IN_RING3) && (defined(RT_STRICT) || defined(RT_LOCK_STRICT) || defined(RTSEM_STRICT)))
 # define RTSEMMUTEX_STRICT
 #endif
@@ -66 +66 @@
 # define RTSEMMUTEX_STRICT_POS_DECL             RTHCUINTPTR uId, RT_SRC_POS_DECL
 # define RTSEMMUTEX_STRICT_POS_ARGS             uId, RT_SRC_POS_ARGS
-# define RTSEMMUTEX_STRICT_BLOCK(hThread, pRec) RTThreadBlockingDebug((hThread), RTTHREADSTATE_MUTEX, true, pRec, uId, RT_SRC_POS_ARGS)
+# define RTSEMMUTEX_STRICT_BLOCK(hThread, pRec) RTLockValidatorCheckBlocking(pRec, (hThread), RTTHREADSTATE_MUTEX, true, uId, RT_SRC_POS_ARGS)
 #else
 # define RTSEMMUTEX_STRICT_POS_DECL             int iDummy
@@ -78 +78 @@
  * Enables strictness checks and lock accounting of the RTSemRW API.
  */
-#if defined(DOXYGEN_RUNNING) || (!defined(RTSEMRW_STRICT) && (defined(RT_STRICT) || defined(RT_LOCK_STRICT) || defined(RTSEM_STRICT)))
+#if defined(DOXYGEN_RUNNING) || (!defined(RTSEMRW_STRICT) && defined(IN_RING3) && (defined(RT_STRICT) || defined(RT_LOCK_STRICT) || defined(RTSEM_STRICT)))
 # define RTSEMRW_STRICT
 #endif

trunk/src/VBox/Runtime/include/internal/thread.h

@@ -39 +39 @@
 # include <iprt/critsect.h>
 #endif
+#include "internal/lockvalidator.h"
 #include "internal/magics.h"
 
@@ -47 +48 @@
 
 /** Max thread name length. */
-#define RTTHREAD_NAME_LEN 16
+#define RTTHREAD_NAME_LEN       16
 #ifdef IPRT_WITH_GENERIC_TLS
 /** The number of TLS entries for the generic implementation. */
-# define RTTHREAD_TLS_ENTRIES 64
+# define RTTHREAD_TLS_ENTRIES   64
 #endif
 
@@ -90 +91 @@
     size_t                  cbStack;
 #ifdef IN_RING3
-    /** What we're blocking on. */
-    union RTTHREADINTBLOCKID
-    {
-        PRTLOCKVALIDATORREC pRec;
-        uint64_t            u64;
-    } Block;
-    /** Where we're blocking. */
-    const char volatile    *pszBlockFunction;
-    /** Where we're blocking. */
-    const char volatile    *pszBlockFile;
-    /** Where we're blocking. */
-    uint32_t volatile       uBlockLine;
-    /** Where we're blocking. */
-    RTHCUINTPTR volatile    uBlockId;
-    /** Number of registered write locks, mutexes and critsects that this thread owns. */
-    int32_t volatile        cWriteLocks;
-    /** Number of registered read locks that this thread owns, nesting included. */
-    int32_t volatile        cReadLocks;
+    /** The lock validator data. */
+    RTLOCKVALIDATORPERTHREAD LockValidator;
 #endif /* IN_RING3 */
 #ifdef IPRT_WITH_GENERIC_TLS
@@ -209 +194 @@
 #endif
 
+/**
+ * Gets the thread state.
+ *
+ * @returns The thread state.
+ * @param   pThread             The thread.
+ */
+DECLINLINE(RTTHREADSTATE) rtThreadGetState(PRTTHREADINT pThread)
+{
+    return pThread->enmState;
+}
+
 RT_C_DECLS_END