diff options
| author | Mark Spencer <markster@digium.com> | 2004-04-06 20:35:55 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-04-06 20:35:55 +0000 |
| commit | 584936aa9b90685f86eaf8ddabe39063aedf1981 (patch) | |
| tree | 2506d837e44adb5f16c1116543ee58a328a644aa /include | |
| parent | 672e3e49fbb0216d5409e5b53d858bcbf9248251 (diff) | |
Update locking for non-debug mode, too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2641 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rwxr-xr-x | include/asterisk/lock.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 673fb48bc..1860f6a6b 100755 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -155,18 +155,23 @@ static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char * #else /* DEBUG_THREADS */ -#define AST_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#ifdef PTHREAD_MUTEX_FAST_NP -#define AST_MUTEX_KIND PTHREAD_MUTEX_FAST_NP -#else -#define AST_MUTEX_KIND PTHREAD_NORMAL -#endif +/* From now on, Asterisk REQUIRES Recursive (not error checking) mutexes + and will not run without them. */ +#define AST_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP typedef pthread_mutex_t ast_mutex_t; #define ast_mutex_lock(t) pthread_mutex_lock(t) #define ast_mutex_unlock(t) pthread_mutex_unlock(t) #define ast_mutex_trylock(t) pthread_mutex_trylock(t) +static inline int ast_mutex_init(ast_mutex_t *t) +{ + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, AST_MUTEX_KIND); + return pthread_mutex_init(t, &attr); +} #define ast_mutex_init(t) pthread_mutex_init(t, NULL) #define ast_pthread_mutex_init(t,a) pthread_mutex_init(t,a) #define ast_mutex_destroy(t) pthread_mutex_destroy(t) |