Changeset 25690 in vbox for trunk/src/VBox/Runtime/include/internal

Timestamp:

Jan 8, 2010 1:20:15 PM (15 years ago)

Author:

vboxsync

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

56423

Message:

iprt/lockvalidator: Record recursion on the lock stack.

Location:

trunk/src/VBox/Runtime/include/internal

Files:

• lockvalidator.h (modified) (5 diffs)
• magics.h (modified) (1 diff)

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

@@ -38 +38 @@
 RT_C_DECLS_BEGIN
 
+
+/**
+ * Record used only on the lock stack for recording the stack and source
+ * position of a recursive lock acquisition.
+ */
+typedef struct RTLOCKVALRECNEST
+{
+    RTLOCKVALRECCORE                Core;
+    /** The recursion level at this point in the stack. */
+    uint32_t                        cRecursion;
+    /** Pointer to the next record on the stack. */
+    PRTLOCKVALRECUNION volatile     pDown;
+    /** Pointer to the first recursion. */
+    PRTLOCKVALRECUNION volatile     pRec;
+    /** Pointer to the next free record when in the
+     *  RTLOCKVALPERTHREAD::pFreeNestRecs list. */
+    struct RTLOCKVALRECNEST        *pNextFree;
+    /** The source position. */
+    RTLOCKVALSRCPOS                 SrcPos;
+} RTLOCKVALRECNEST;
+/** Pointer to a recursion record. */
+typedef RTLOCKVALRECNEST *PRTLOCKVALRECNEST;
+
+
 /**
  * Record union for simplifying internal processing.
@@ -43 +67 @@
 typedef union RTLOCKVALRECUNION
 {
-    RTLOCKVALRECCORE      Core;
-    RTLOCKVALRECEXCL      Excl;
-    RTLOCKVALRECSHRD      Shared;
-    RTLOCKVALRECSHRDOWN   ShrdOwner;
+    RTLOCKVALRECCORE                Core;
+    RTLOCKVALRECEXCL                Excl;
+    RTLOCKVALRECSHRD                Shared;
+    RTLOCKVALRECSHRDOWN             ShrdOwner;
+    RTLOCKVALRECNEST                Nest;
 } RTLOCKVALRECUNION;
 
@@ -59 +84 @@
     /** Where we are blocking. */
     RTLOCKVALSRCPOS                 SrcPos;
+    /** Top of the lock stack. */
+    PRTLOCKVALRECUNION volatile     pStackTop;
+    /** List of free recursion (nesting) record. */
+    PRTLOCKVALRECNEST               pFreeNestRecs;
     /** What we're blocking on.
      * The lock validator sets this, RTThreadUnblock clears it. */
@@ -65 +94 @@
      * RTThreadUnblocking uses this to figure out when to clear pRec. */
     RTTHREADSTATE volatile          enmRecState;
-    /** Top of the lock stack. */
-    PRTLOCKVALRECUNION volatile     pStackTop;
     /** The thread is running inside the lock validator. */
     bool volatile                   fInValidator;
@@ -85 +112 @@
 
 DECLHIDDEN(void)    rtLockValidatorInitPerThread(RTLOCKVALPERTHREAD *pPerThread);
+DECLHIDDEN(void)    rtLockValidatorDeletePerThread(RTLOCKVALPERTHREAD *pPerThread);
 DECLHIDDEN(void)    rtLockValidatorSerializeDestructEnter(void);
 DECLHIDDEN(void)    rtLockValidatorSerializeDestructLeave(void);

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

@@ -83 +83 @@
 /** The magic value for RTLOCKVALRECSHRDOWN::u32Magic after deletion. */
 #define RTLOCKVALRECSHRDOWN_MAGIC_DEAD  UINT32_C(0x19760509)
+/** The magic value for RTLOCKVALRECNEST::u32Magic. (Anne Desclos) */
+#define RTLOCKVALRECNEST_MAGIC          UINT32_C(0x19071123)
+/** The magic value for RTLOCKVALRECNEST::u32Magic after deletion. */
+#define RTLOCKVALRECNEST_MAGIC_DEAD     UINT32_C(0x19980427)
 /** Magic number for RTMEMCACHEINT::u32Magic. (Joseph Weizenbaum) */
 #define RTMEMCACHE_MAGIC                UINT32_C(0x19230108)