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

Timestamp:

Dec 14, 2009 4:31:40 PM (15 years ago)

Author:

vboxsync

Message:

RTCritSect,PDMCritSect,iprt/lockvalidator.h: Reworked the deadlocking detection for critical sections and preparing for lock order validation. This change generalizes the RTCRITSECT::Strict data and moves it out of the RTCRITSECT, leaving a pointer behind. This saves a bit of space in release builds.

Location:

trunk/src/VBox/Runtime/include/internal

Files:

• magics.h (modified) (1 diff)
• thread.h (modified) (1 diff)

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

@@ -67 +67 @@
 /** The magic value for RTLOCALIPCSERVER::u32Magic. (Katsuhiro Otomo) */
 #define RTLOCALIPCSESSION_MAGIC     0x19530414
+/** The magic value for RTLOCKVALIDATORREC::u32Magic. (Vladimir Vladimirovich Nabokov) */
+#define RTLOCKVALIDATORREC_MAGIC    0x18990422
+/** The dead magic value for RTLOCKVALIDATORREC::u32Magic. */
+#define RTLOCKVALIDATORREC_MAGIC_DEAD 0x19770702
 /** Magic number for RTMEMCACHEINT::u32Magic. (Joseph Weizenbaum) */
 #define RTMEMCACHE_MAGIC            0x19230108

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

@@ -93 +93 @@
     union RTTHREADINTBLOCKID
     {
+        PRTLOCKVALIDATORREC pRec;
         uint64_t            u64;
-        PRTCRITSECT         pCritSect;
-        RTSEMEVENT          Event;
-        RTSEMEVENTMULTI     EventMulti;
-        RTSEMMUTEX          Mutex;
     } Block;
     /** Where we're blocking. */
+    const char volatile    *pszBlockFunction;
+    /** Where we're blocking. */
     const char volatile    *pszBlockFile;
     /** Where we're blocking. */
-    unsigned volatile       uBlockLine;
-    /** Where we're blocking. */
-    RTUINTPTR volatile      uBlockId;
+    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;