diff options
Diffstat (limited to 'include/asterisk/lock.h')
| -rw-r--r-- | include/asterisk/lock.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index b37156a10..123ae76d2 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -312,6 +312,7 @@ static inline int __ast_pthread_mutex_init(int track, const char *filename, int #define ast_mutex_init_notracking(pmutex) \ __ast_pthread_mutex_init(0, __FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex) +#define ROFFSET ((t->reentrancy > 0) ? (t->reentrancy-1) : 0) static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *func, const char *mutex_name, ast_mutex_t *t) { @@ -346,7 +347,7 @@ static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, filename, lineno, func, mutex_name); ast_reentrancy_lock(t); __ast_mutex_logger("%s line %d (%s): Error: '%s' was locked here.\n", - t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name); + t->file[ROFFSET], t->lineno[ROFFSET], t->func[ROFFSET], mutex_name); ast_reentrancy_unlock(t); break; } @@ -413,8 +414,8 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con filename, lineno, func, (int) wait_time, mutex_name); ast_reentrancy_lock(t); __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], - t->func[t->reentrancy-1], mutex_name); + t->file[ROFFSET], t->lineno[ROFFSET], + t->func[ROFFSET], mutex_name); ast_reentrancy_unlock(t); reported_wait = wait_time; } @@ -524,11 +525,11 @@ static inline int __ast_pthread_mutex_unlock(const char *filename, int lineno, c #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ ast_reentrancy_lock(t); - if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) { + if (t->reentrancy && (t->thread[ROFFSET] != pthread_self())) { __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", filename, lineno, func, mutex_name); __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name); + t->file[ROFFSET], t->lineno[ROFFSET], t->func[ROFFSET], mutex_name); DO_THREAD_CRASH; } @@ -603,11 +604,11 @@ static inline int __ast_cond_wait(const char *filename, int lineno, const char * #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ ast_reentrancy_lock(t); - if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) { + if (t->reentrancy && (t->thread[ROFFSET] != pthread_self())) { __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", filename, lineno, func, mutex_name); __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name); + t->file[ROFFSET], t->lineno[ROFFSET], t->func[ROFFSET], mutex_name); DO_THREAD_CRASH; } @@ -674,11 +675,11 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ ast_reentrancy_lock(t); - if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) { + if (t->reentrancy && (t->thread[ROFFSET] != pthread_self())) { __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", filename, lineno, func, mutex_name); __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name); + t->file[ROFFSET], t->lineno[ROFFSET], t->func[ROFFSET], mutex_name); DO_THREAD_CRASH; } |