diff options
| -rw-r--r-- | include/asterisk/lock.h | 27 | ||||
| -rw-r--r-- | main/utils.c | 26 |
2 files changed, 39 insertions, 14 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index cbd8f3a55..f25070d8e 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -126,6 +126,12 @@ typedef pthread_cond_t ast_cond_t; static pthread_mutex_t empty_mutex; +enum ast_lock_type { + AST_MUTEX, + AST_RDLOCK, + AST_WRLOCK, +}; + /*! * \brief Store lock info for the current thread * @@ -134,8 +140,8 @@ static pthread_mutex_t empty_mutex; * lock info struct. The lock is marked as pending as the thread is waiting * on the lock. ast_mark_lock_acquired() will mark it as held by this thread. */ -void ast_store_lock_info(const char *filename, int line_num, - const char *func, const char *lock_name, void *lock_addr); +void ast_store_lock_info(enum ast_lock_type type, const char *filename, + int line_num, const char *func, const char *lock_name, void *lock_addr); /*! * \brief Mark the last lock as acquired @@ -249,7 +255,7 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con int canlog = strcmp(filename, "logger.c"); if (t->track) - ast_store_lock_info(filename, lineno, func, mutex_name, &t->mutex); + ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, &t->mutex); #if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) if ((t->mutex) == ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) { @@ -333,7 +339,7 @@ static inline int __ast_pthread_mutex_trylock(const char *filename, int lineno, #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ if (t->track) - ast_store_lock_info(filename, lineno, func, mutex_name, &t->mutex); + ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, &t->mutex); if (!(res = pthread_mutex_trylock(&t->mutex))) { if (t->track) @@ -469,7 +475,7 @@ static inline int __ast_cond_wait(const char *filename, int lineno, const char * DO_THREAD_CRASH; } else { if (t->track) - ast_store_lock_info(filename, lineno, func, mutex_name, &t->mutex); + ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, &t->mutex); if (t->reentrancy < AST_MAX_REENTRANCY) { t->file[t->reentrancy] = filename; @@ -530,7 +536,7 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c DO_THREAD_CRASH; } else { if (t->track) - ast_store_lock_info(filename, lineno, func, mutex_name, &t->mutex); + ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, &t->mutex); if (t->reentrancy < AST_MAX_REENTRANCY) { t->file[t->reentrancy] = filename; @@ -722,7 +728,7 @@ static inline int _ast_rwlock_rdlock(ast_rwlock_t *lock, const char *name, const char *file, int line, const char *func) { int res; - ast_store_lock_info(file, line, func, name, lock); + ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock); res = pthread_rwlock_rdlock(lock); if (!res) ast_mark_lock_acquired(); @@ -738,7 +744,7 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *lock, const char *name, const char *file, int line, const char *func) { int res; - ast_store_lock_info(file, line, func, name, lock); + ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock); res = pthread_rwlock_wrlock(lock); if (!res) ast_mark_lock_acquired(); @@ -754,7 +760,7 @@ static inline int _ast_rwlock_tryrdlock(ast_rwlock_t *lock, const char *name, const char *file, int line, const char *func) { int res; - ast_store_lock_info(file, line, func, name, lock); + ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock); res = pthread_rwlock_tryrdlock(lock); if (!res) ast_mark_lock_acquired(); @@ -770,7 +776,7 @@ static inline int _ast_rwlock_trywrlock(ast_rwlock_t *lock, const char *name, const char *file, int line, const char *func) { int res; - ast_store_lock_info(file, line, func, name, lock); + ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock); res = pthread_rwlock_trywrlock(lock); if (!res) ast_mark_lock_acquired(); @@ -780,6 +786,7 @@ static inline int _ast_rwlock_trywrlock(ast_rwlock_t *lock, const char *name, } #else + static inline int ast_rwlock_unlock(ast_rwlock_t *prwlock) { return pthread_rwlock_unlock(prwlock); diff --git a/main/utils.c b/main/utils.c index 2b87e2b4a..0038f01fb 100644 --- a/main/utils.c +++ b/main/utils.c @@ -547,6 +547,7 @@ struct thr_lock_info { const char *lock_name; void *lock_addr; int times_locked; + enum ast_lock_type type; /*! This thread is waiting on this lock */ unsigned int pending:1; } locks[AST_MAX_LOCKS]; @@ -592,8 +593,8 @@ static void lock_info_destroy(void *data) */ AST_THREADSTORAGE_CUSTOM(thread_lock_info, NULL, lock_info_destroy); -void ast_store_lock_info(const char *filename, int line_num, - const char *func, const char *lock_name, void *lock_addr) +void ast_store_lock_info(enum ast_lock_type type, const char *filename, + int line_num, const char *func, const char *lock_name, void *lock_addr) { struct thr_lock_info *lock_info; int i; @@ -625,6 +626,7 @@ void ast_store_lock_info(const char *filename, int line_num, lock_info->locks[i].lock_name = lock_name; lock_info->locks[i].lock_addr = lock_addr; lock_info->locks[i].times_locked = 1; + lock_info->locks[i].type = type; lock_info->locks[i].pending = 1; lock_info->num_locks++; @@ -681,6 +683,20 @@ void ast_remove_lock_info(void *lock_addr) pthread_mutex_unlock(&lock_info->lock); } +static const char *locktype2str(enum ast_lock_type type) +{ + switch (type) { + case AST_MUTEX: + return "MUTEX"; + case AST_RDLOCK: + return "RDLOCK"; + case AST_WRLOCK: + return "WRLOCK"; + } + + return "UNKNOWN"; +} + static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { struct thr_lock_info *lock_info; @@ -713,9 +729,11 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_ lock_info->thread_name); pthread_mutex_lock(&lock_info->lock); for (i = 0; i < lock_info->num_locks; i++) { - ast_cli(a->fd, "=== ---> %sLock #%d: %s %d %s %s %p (%d)\n", + ast_cli(a->fd, "=== ---> %sLock #%d (%s): %s %d %s %s %p (%d)\n", lock_info->locks[i].pending ? "Waiting for " : "", i, - lock_info->locks[i].file, lock_info->locks[i].line_num, + lock_info->locks[i].file, + locktype2str(lock_info->locks[i].type), + lock_info->locks[i].line_num, lock_info->locks[i].func, lock_info->locks[i].lock_name, lock_info->locks[i].lock_addr, lock_info->locks[i].times_locked); |