Bite the bullet and require RECURSIVE mutexes
[asterisk/asterisk.git] / include / asterisk / lock.h
index 9459042..673fb48 100755 (executable)
 
 #include <pthread.h>
 
+#define AST_PTHREADT_NULL (pthread_t) -1
+#define AST_PTHREADT_STOP (pthread_t) -2
+
 #ifdef DEBUG_THREADS
+
 #ifdef THREAD_CRASH
 #define DO_THREAD_CRASH do { *((int *)(0)) = 1; } while(0)
 #endif
 
-
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 
-// #define AST_MUTEX_INITIALIZER      PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-// #define AST_MUTEX_KIND             PTHREAD_MUTEX_RECURSIVE_NP
-#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-#define AST_MUTEX_INITIALIZER         { PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 }
-#else
-#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#define AST_MUTEX_INITIALIZER         { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 }
-#else
-#define AST_MUTEX_INITIALIZER         { PTHREAD_MUTEX_INITIALIZER, NULL, 0, NULL, 0 }
-#endif
-#endif
-#ifdef PTHREAD_MUTEX_ERRORCHECK_NP
-#define AST_MUTEX_KIND                PTHREAD_MUTEX_ERRORCHECK_NP
-#else
-#define AST_MUTEX_KIND                PTHREAD_MUTEX_ERRORCHECK
-#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
 
 struct ast_mutex_info {
        pthread_mutex_t mutex;
@@ -154,7 +146,14 @@ static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char *
 
 #define ast_mutex_destroy(a) __ast_pthread_mutex_destroy(__FILE__, __LINE__, __PRETTY_FUNCTION__, a)
 
-#else
+#define pthread_mutex_t use_ast_mutex_t_instead_of_pthread_mutex_t
+#define pthread_mutex_lock use_ast_mutex_lock_instead_of_pthread_mutex_lock
+#define pthread_mutex_unlock use_ast_mutex_unlock_instead_of_pthread_mutex_unlock
+#define pthread_mutex_trylock use_ast_mutex_trylock_instead_of_pthread_mutex_trylock
+#define pthread_mutex_init use_ast_pthread_mutex_init_instead_of_pthread_mutex_init
+#define pthread_mutex_destroy use_ast_pthread_mutex_destroy_instead_of_pthread_mutex_destroy
+
+#else /* DEBUG_THREADS */
 
 #define AST_MUTEX_INITIALIZER      PTHREAD_MUTEX_INITIALIZER
 #ifdef PTHREAD_MUTEX_FAST_NP
@@ -165,42 +164,14 @@ static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char *
 
 typedef pthread_mutex_t ast_mutex_t;
 
-static inline int ast_mutex_lock(ast_mutex_t *t)
-{
-       return pthread_mutex_lock(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)
+#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)
 
-static inline int ast_mutex_unlock(ast_mutex_t *t)
-{
-       return pthread_mutex_unlock(t);
-}
-
-static inline int ast_mutex_trylock(ast_mutex_t *t)
-{
-       return pthread_mutex_trylock(t);
-}
-
-static inline int ast_pthread_mutex_init(ast_mutex_t *t, const pthread_mutexattr_t *mutexattr)
-{
-       return pthread_mutex_init(t, mutexattr);
-}
-
-static inline int ast_mutex_init(ast_mutex_t *t)
-{
-       return pthread_mutex_init(t, NULL);
-}
+#endif /* DEBUG_THREADS */
 
-static inline int ast_mutex_destroy(ast_mutex_t *t)
-{
-       return pthread_mutex_destroy(t);
-}
-#endif
-
-#define pthread_mutex_t use_ast_mutex_t_instead_of_pthread_mutex_t
-#define pthread_mutex_lock use_ast_mutex_lock_instead_of_pthread_mutex_lock
-#define pthread_mutex_unlock use_ast_mutex_unlock_instead_of_pthread_mutex_unlock
-#define pthread_mutex_trylock use_ast_mutex_trylock_instead_of_pthread_mutex_trylock
-#define pthread_mutex_init use_ast_pthread_mutex_init_instead_of_pthread_mutex_init
-#define pthread_mutex_destroy use_ast_pthread_mutex_destroy_instead_of_pthread_mutex_destroy
 
 #endif