From bc7a0be8eb24f5347b8a5b51067b15270aa84691 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 5 Nov 2007 00:16:58 +0000 Subject: [PATCH] windows-osi-lock-assert-msg-20071104 modify lock_AssertXXX macros to call osi_assertx() and provide a descriptive message. --- src/WINNT/client_osi/osibasel.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/WINNT/client_osi/osibasel.h b/src/WINNT/client_osi/osibasel.h index 633ee84c9..5fd2d73a8 100644 --- a/src/WINNT/client_osi/osibasel.h +++ b/src/WINNT/client_osi/osibasel.h @@ -121,12 +121,12 @@ extern void osi_BaseInit(void); /* and friendly macros */ -#define lock_AssertRead(x) osi_assert(lock_GetRWLockState(x) & OSI_RWLOCK_READHELD) +#define lock_AssertRead(x) osi_assertx(lock_GetRWLockState(x) & OSI_RWLOCK_READHELD, "!OSI_RWLOCK_READHELD") -#define lock_AssertWrite(x) osi_assert(lock_GetRWLockState(x) & OSI_RWLOCK_WRITEHELD) +#define lock_AssertWrite(x) osi_assertx(lock_GetRWLockState(x) & OSI_RWLOCK_WRITEHELD, "!OSI_RWLOCK_WRITEHELD") -#define lock_AssertAny(x) osi_assert(lock_GetRWLockState(x) != 0) +#define lock_AssertAny(x) osi_assertx(lock_GetRWLockState(x) != 0, "!(OSI_RWLOCK_READHELD | OSI_RWLOCK_WRITEHELD)") -#define lock_AssertMutex(x) osi_assert(lock_GetMutexState(x) & OSI_MUTEX_HELD) +#define lock_AssertMutex(x) osi_assertx(lock_GetMutexState(x) & OSI_MUTEX_HELD, "!OSI_MUTEX_HELD") #endif /*_OSIBASEL_H_ENV_ */ -- 2.39.5