kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 10:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac OS X does not support comparing a mutex to its initializer. Create a test for this.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@256370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-04-06 19:28:42 +00:00
parent d3f44c979c
commit bcbafc800e
4 changed files with 97 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/asterisk/lock.h
View File

@@ -83,7 +83,7 @@
#define AST_PTHREADT_NULL (pthread_t) -1
#define AST_PTHREADT_STOP (pthread_t) -2
#if (defined(SOLARIS) || defined(BSD)) && !defined(__Darwin__)
#if (defined(SOLARIS) || defined(BSD))
#define AST_MUTEX_INIT_W_CONSTRUCTORS
#endif /* SOLARIS || BSD */
@@ -380,7 +380,7 @@ static inline int __ast_pthread_mutex_init(int tracking, const char *filename, i
int res;
pthread_mutexattr_t attr;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->mutex) != ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
/*
@@ -417,7 +417,7 @@ static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno,
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->mutex) == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
/* Don't try to uninitialize non initialized mutex
* This may no effect on linux
@@ -485,7 +485,7 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con
struct ast_bt *bt = NULL;
#endif
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS)
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->mutex) == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
/* Don't warn abount uninitialized mutex.
* Simple try to initialize it.
@@ -609,7 +609,7 @@ static inline int __ast_pthread_mutex_trylock(const char *filename, int lineno,
struct ast_bt *bt = NULL;
#endif
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS)
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->mutex) == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
/* Don't warn abount uninitialized mutex.
* Simple try to initialize it.
@@ -671,7 +671,7 @@ static inline int __ast_pthread_mutex_unlock(const char *filename, int lineno, c
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->mutex) == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
__ast_mutex_logger("%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
filename, lineno, func, mutex_name);
@@ -768,7 +768,7 @@ static inline int __ast_cond_wait(const char *filename, int lineno, const char *
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->mutex) == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
__ast_mutex_logger("%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
filename, lineno, func, mutex_name);
@@ -866,7 +866,7 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->mutex) == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
__ast_mutex_logger("%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
filename, lineno, func, mutex_name);
@@ -1011,8 +1011,8 @@ static inline int __ast_rwlock_init(int tracking, const char *filename, int line
struct ast_lock_track *lt= &t->track;
pthread_rwlockattr_t attr;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
int canlog = strcmp(filename, "logger.c") & t->tracking;
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
int canlog = strcmp(filename, "logger.c") & t->tracking;
if (t->lock != ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
__ast_mutex_logger("%s line %d (%s): Warning: rwlock '%s' is already initialized.\n",
@@ -1040,7 +1040,7 @@ static inline int __ast_rwlock_destroy(const char *filename, int lineno, const c
struct ast_lock_track *lt = &t->track;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if (t->lock == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
__ast_mutex_logger("%s line %d (%s): Warning: rwlock '%s' is uninitialized.\n",
filename, lineno, func, rwlock_name);
@@ -1079,7 +1079,7 @@ static inline int _ast_rwlock_unlock(ast_rwlock_t *t, const char *name,
int lock_found = 0;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
__ast_mutex_logger("%s line %d (%s): Warning: rwlock '%s' is uninitialized.\n",
filename, line, func, name);
@@ -1152,7 +1152,7 @@ static inline int _ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
/* Don't warn abount uninitialized lock.
* Simple try to initialize it.
@@ -1260,7 +1260,7 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
/* Don't warn abount uninitialized lock.
* Simple try to initialize it.
@@ -1370,7 +1370,7 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
/* Don't warn abount uninitialized lock.
* Simple try to initialize it.
@@ -1465,7 +1465,7 @@ static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
/* Don't warn abount uninitialized lock.
* Simple try to initialize it.
@@ -1555,7 +1555,7 @@ static inline int _ast_rwlock_tryrdlock(ast_rwlock_t *t, const char *name,
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
int canlog = strcmp(filename, "logger.c") & t->tracking;
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
@@ -1613,7 +1613,7 @@ static inline int _ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
#endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
int canlog = strcmp(filename, "logger.c") & t->tracking;
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {