Changeset 36472 in vbox

Timestamp:

Mar 30, 2011 9:59:55 AM (14 years ago)

Author:

vboxsync

Message:

addendum to r70394 for RTCrit*

Location:

trunk

Files:

• include/iprt/critsect.h (modified) (2 diffs)
• src/VBox/Runtime/generic/critsect-generic.cpp (modified) (5 diffs)
• src/VBox/Runtime/testcase/tstRTCritSect.cpp (modified) (3 diffs)

trunk/include/iprt/critsect.h

@@ -333 +333 @@
 
 /* Lock strict build: Remap the three enter calls to the debug versions. */
-#ifdef RT_LOCK_STRICT
+#if defined(RT_LOCK_STRICT) && !defined(CRITSECT_WITHOUT_REMAPPING) && !defined(RT_WITH_MANGLING)
 # ifdef ___iprt_asm_h
 #  define RTCritSectEnter(pCritSect)                        RTCritSectEnterDebug(pCritSect, (uintptr_t)ASMReturnAddress(), RT_SRC_POS)
@@ -346 +346 @@
 
 /* Strict lock order: Automatically classify locks by init location. */
-#if defined(RT_LOCK_STRICT_ORDER) && defined(IN_RING3)
+#if defined(RT_LOCK_STRICT_ORDER) && defined(IN_RING3) && !defined(CRITSECT_WITHOUT_REMAPPING) &&!defined(RT_WITH_MANGLING)
 # define RTCritSectInit(pCritSect) \
     RTCritSectInitEx((pCritSect), 0 /*fFlags*/, \

trunk/src/VBox/Runtime/generic/critsect-generic.cpp

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#define CRITSECT_WITHOUT_REMAPPING
 #include <iprt/critsect.h>
 #include "internal/iprt.h"
@@ -41 +42 @@
 
 
-#undef RTCritSectInit
 RTDECL(int) RTCritSectInit(PRTCRITSECT pCritSect)
 {
@@ -164 +164 @@
 
 
-#undef RTCritSectTryEnter
 RTDECL(int) RTCritSectTryEnter(PRTCRITSECT pCritSect)
 {
@@ -283 +282 @@
 
 
-#undef RTCritSectEnter
 RTDECL(int) RTCritSectEnter(PRTCRITSECT pCritSect)
 {
@@ -426 +424 @@
 
 
-#undef RTCritSectEnterMultiple
 RTDECL(int) RTCritSectEnterMultiple(size_t cCritSects, PRTCRITSECT *papCritSects)
 {

trunk/src/VBox/Runtime/testcase/tstRTCritSect.cpp

@@ -31 +31 @@
 # include <Windows.h>
 #endif
+#define CRITSECT_WITHOUT_REMAPPING
 #include <iprt/critsect.h>
 
@@ -59 +60 @@
 #define LOCKERS(sect)   (*(LONG volatile *)&(sect).LockCount)
 
-#undef RTCritSectInit
 DECLINLINE(int) RTCritSectInit(PCRITICAL_SECTION pCritSect)
 {
@@ -66 +66 @@
 }
 
-#undef RTCritSectEnter
 DECLINLINE(int) RTCritSectEnter(PCRITICAL_SECTION pCritSect)
 {