From ee8e3c3f0124c6ca53fecae80a673c79168dedf8 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 17 Jan 2009 20:09:55 +0000 Subject: [PATCH] Reinstate: Always check the result of pthread_mutex_lock() and pthread_mutex_unlock(). Sun Jan 4 19:24:43 GMT 2009 Matthias Kilian Don't check pthread_mutex_*lock() only on Linux and/or only if DEBUG is defined. The return values of those functions are well defined and should be supported on all operation systems with pthreads. The checks are cheap enough to do them even in the default build (without -DDEBUG). While here, recycle an unused macro ASSERT_LOCK_NOTHELD, and let the debugBelch part enabled with -DLOCK_DEBUG work independently of -DDEBUG. --- includes/OSThreads.h | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/includes/OSThreads.h b/includes/OSThreads.h index d79b9af..fd57f56 100644 --- a/includes/OSThreads.h +++ b/includes/OSThreads.h @@ -23,6 +23,7 @@ #else #include +#include typedef pthread_cond_t Condition; typedef pthread_mutex_t Mutex; @@ -34,48 +35,27 @@ typedef pthread_key_t ThreadLocalKey; #define INIT_COND_VAR PTHREAD_COND_INITIALIZER #ifdef LOCK_DEBUG +#define LOCK_DEBUG_BELCH(what, mutex) \ + debugBelch("%s(0x%p) %s %d\n", what, mutex, __FILE__, __LINE__) +#else +#define LOCK_DEBUG_BELCH(what, mutex) /* nothing */ +#endif +/* Always check the result of lock and unlock. */ #define ACQUIRE_LOCK(mutex) \ - debugBelch("ACQUIRE_LOCK(0x%p) %s %d\n", mutex,__FILE__,__LINE__); \ - pthread_mutex_lock(mutex) -#define RELEASE_LOCK(mutex) \ - debugBelch("RELEASE_LOCK(0x%p) %s %d\n", mutex,__FILE__,__LINE__); \ - pthread_mutex_unlock(mutex) -#define ASSERT_LOCK_HELD(mutex) /* nothing */ - -#elif defined(DEBUG) && defined(linux_HOST_OS) -#include -/* - * On Linux, we can use extensions to determine whether we already - * hold a lock or not, which is useful for debugging. - */ -#define ACQUIRE_LOCK(mutex) \ + LOCK_DEBUG_BELCH("ACQUIRE_LOCK", mutex); \ if (pthread_mutex_lock(mutex) == EDEADLK) { \ barf("multiple ACQUIRE_LOCK: %s %d", __FILE__,__LINE__); \ } + #define RELEASE_LOCK(mutex) \ + LOCK_DEBUG_BELCH("RELEASE_LOCK", mutex); \ if (pthread_mutex_unlock(mutex) != 0) { \ barf("RELEASE_LOCK: I do not own this lock: %s %d", __FILE__,__LINE__); \ } #define ASSERT_LOCK_HELD(mutex) ASSERT(pthread_mutex_lock(mutex) == EDEADLK) -#define ASSERT_LOCK_NOTHELD(mutex) \ - if (pthread_mutex_lock(mutex) != EDEADLK) { \ - pthread_mutex_unlock(mutex); \ - } else { \ - ASSERT(0); \ - } - - -#else - -#define ACQUIRE_LOCK(mutex) pthread_mutex_lock(mutex) -#define RELEASE_LOCK(mutex) pthread_mutex_unlock(mutex) -#define ASSERT_LOCK_HELD(mutex) /* nothing */ - -#endif - #endif // CMINUSMINUS # elif defined(HAVE_WINDOWS_H) -- 1.7.10.4