Changeset 25368 in vbox for trunk/include/VBox/pdmcritsect.h

Timestamp:

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

Author:

vboxsync

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

55985

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.

File:

• trunk/include/VBox/pdmcritsect.h (modified) (3 diffs)

trunk/include/VBox/pdmcritsect.h

@@ -48 +48 @@
 {
     /** Padding. */
-    uint8_t padding[HC_ARCH_BITS == 64 ? 0xb8 : 0xa8];
+    uint8_t padding[HC_ARCH_BITS == 32 ? 0x80 : 0xc0];
 #ifdef PDMCRITSECTINT_DECLARED
     /** The internal structure (not normally visible). */
@@ -57 +57 @@
 VMMR3DECL(int)      PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, const char *pszName);
 VMMDECL(int)        PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy);
+VMMDECL(int)        PDMCritSectEnterDebug(PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);
 VMMDECL(int)        PDMCritSectTryEnter(PPDMCRITSECT pCritSect);
+VMMDECL(int)        PDMCritSectTryEnterDebug(PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
 VMMR3DECL(int)      PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallRing3);
 VMMDECL(void)       PDMCritSectLeave(PPDMCRITSECT pCritSect);
@@ -75 +77 @@
 VMMR3DECL(void)     PDMR3CritSectLeaveAll(PVM pVM);
 
+/* Strict build: Remap the two enter calls to the debug versions. */
+#ifdef VBOX_STRICT
+# ifdef ___iprt_asm_h
+#  define PDMCritSectEnter(pCritSect, rcBusy)   PDMCritSectEnterDebug((pCritSect), (rcBusy), (uintptr_t)ASMReturnAddress(), RT_SRC_POS)
+#  define PDMCritSectTryEnter(pCritSect)        PDMCritSectTryEnterDebug((pCritSect), (uintptr_t)ASMReturnAddress(), RT_SRC_POS)
+# else
+#  define PDMCritSectEnter(pCritSect, rcBusy)   PDMCritSectEnterDebug((pCritSect), (rcBusy), 0, RT_SRC_POS)
+#  define PDMCritSectTryEnter(pCritSect)        PDMCritSectTryEnterDebug((pCritSect), 0, RT_SRC_POS)
+# endif
+#endif
+
 /** @} */