Revert locking changes which break static locks (even on linux since it's part of an ENUM not define)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
63702b9a78
commit
fec02c20a9
|
@ -19,17 +19,6 @@
|
||||||
#define AST_PTHREADT_NULL (pthread_t) -1
|
#define AST_PTHREADT_NULL (pthread_t) -1
|
||||||
#define AST_PTHREADT_STOP (pthread_t) -2
|
#define AST_PTHREADT_STOP (pthread_t) -2
|
||||||
|
|
||||||
/* From now on, Asterisk REQUIRES Recursive (not error checking) mutexes
|
|
||||||
and will not run without them. */
|
|
||||||
|
|
||||||
#ifdef PTHREAD_MUTEX_RECURSIVE_NP
|
|
||||||
#define AST_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
|
|
||||||
#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP
|
|
||||||
#else
|
|
||||||
#define AST_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
|
|
||||||
#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef DEBUG_THREADS
|
#ifdef DEBUG_THREADS
|
||||||
|
|
||||||
#ifdef THREAD_CRASH
|
#ifdef THREAD_CRASH
|
||||||
|
@ -41,6 +30,12 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
/* 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 {
|
struct ast_mutex_info {
|
||||||
pthread_mutex_t mutex;
|
pthread_mutex_t mutex;
|
||||||
char *file;
|
char *file;
|
||||||
|
@ -160,6 +155,11 @@ static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char *
|
||||||
|
|
||||||
#else /* DEBUG_THREADS */
|
#else /* DEBUG_THREADS */
|
||||||
|
|
||||||
|
/* 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;
|
typedef pthread_mutex_t ast_mutex_t;
|
||||||
|
|
||||||
#define ast_mutex_lock(t) pthread_mutex_lock(t)
|
#define ast_mutex_lock(t) pthread_mutex_lock(t)
|
||||||
|
|
Loading…
Reference in New Issue