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

Timestamp:

Dec 15, 2009 12:58:08 PM (15 years ago)

Author:

vboxsync

Message:

IPRT,PDMAllocCritSect: Don't bitch when recursivly entering a mutex.

File:

• trunk/src/VBox/Runtime/include/internal/strict.h (modified) (2 diffs)

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

@@ -43 +43 @@
 
 #ifdef RTCRITSECT_STRICT
-# define RTCRITSECT_STRICT_POS_DECL         RTHCUINTPTR uId, RT_SRC_POS_DECL
-# define RTCRITSECT_STRICT_POS_ARGS         uId, RT_SRC_POS_ARGS
-# define RTCRITSECT_STRICT_BLOCK_ARGS(pRec) pRec,     uId, RT_SRC_POS_ARGS
+# define RTCRITSECT_STRICT_POS_DECL             RTHCUINTPTR uId, RT_SRC_POS_DECL
+# 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)
 #else
-# define RTCRITSECT_STRICT_POS_DECL         int iDummy
-# define RTCRITSECT_STRICT_POS_ARGS         0
-# define RTCRITSECT_STRICT_BLOCK_ARGS(pRec) NULL, 0, NULL, 0, NULL
+# define RTCRITSECT_STRICT_POS_DECL             int iDummy
+# define RTCRITSECT_STRICT_POS_ARGS             0
+# define RTCRITSECT_STRICT_BLOCK(hThread, pRec, fRecursive) \
+                                                RTThreadBlocking((hThread), RTTHREADSTATE_CRITSECT)
 #endif
+#define  RTCRITSECT_STRICT_UNBLOCK(hThread)     RTThreadUnblocked((hThread), RTTHREADSTATE_CRITSECT)
 
 
@@ -61 +64 @@
 
 #ifdef RTSEMMUTEX_STRICT
-# 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_ARGS(pRec) pRec,     uId, RT_SRC_POS_ARGS
+# 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)
 #else
-# define RTSEMMUTEX_STRICT_POS_DECL         int iDummy
-# define RTSEMMUTEX_STRICT_POS_ARGS         0
-# define RTSEMMUTEX_STRICT_BLOCK_ARGS(pRec) NULL, 0, NULL, 0, NULL
+# define RTSEMMUTEX_STRICT_POS_DECL             int iDummy
+# define RTSEMMUTEX_STRICT_POS_ARGS             0
+# define RTSEMMUTEX_STRICT_BLOCK(hThread, pRec) RTThreadBlocking((hThread), RTTHREADSTATE_MUTEX)
 #endif
+#define  RTSEMMUTEX_STRICT_UNBLOCK(hThread)     RTThreadUnblocked((hThread), RTTHREADSTATE_MUTEX)