Fulfull a feature request from Qwell on the "core show locks" output. It will

now note the lock type for each lock that a thread holds.
(mutex, rdlock, or wrlock)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84271 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index a0d1542e164b0e7322d5042df35688e6f0864bfb..d80726f5a2350cb716621544fded22c0307e230c 100644 (file)
--- 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 56d3ffe85fa2d2f24f03176674da1b2ba6645f9f..e6b33fb1d273505f7f71deb44e639d0a954bd7ed 100644 (file)
--- a/main/utils.c
+++ b/main/utils.c
@@ -538,6 +538,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];
@@ -583,8 +584,8 @@ static void lock_info_destroy(void *data)
  */
 AST_THREADSTORAGE_CUSTOM(thread_lock_info, thread_lock_info_init, 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;
@@ -616,6 +617,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++;
 
@@ -672,6 +674,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 int handle_show_locks(int fd, int argc, char *argv[])
 {
        struct thr_lock_info *lock_info;
@@ -691,9 +707,11 @@ static int handle_show_locks(int fd, int argc, char *argv[])
                        lock_info->thread_name);
                pthread_mutex_lock(&lock_info->lock);
                for (i = 0; i < lock_info->num_locks; i++) {
-                       ast_cli(fd, "=== ---> %sLock #%d: %s %d %s %s %p (%d)\n", 
+                       ast_cli(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);