Merge revision 124064 from trunk. Add errors that report any locks held by threads...

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

diff --git a/main/utils.c b/main/utils.c
index 7b6e648125c3efbde57c3d96cc79894120b2b527..937383c70d4f06795408ea2e1b3714eb4864c875 100644 (file)
--- a/main/utils.c
+++ b/main/utils.c
@@ -569,11 +569,25 @@ static AST_LIST_HEAD_NOLOCK_STATIC(lock_infos, thr_lock_info);
 static void lock_info_destroy(void *data)
 {
        struct thr_lock_info *lock_info = data;
+       int i;
 
        pthread_mutex_lock(&lock_infos_lock.mutex);
        AST_LIST_REMOVE(&lock_infos, lock_info, entry);
        pthread_mutex_unlock(&lock_infos_lock.mutex);
 
+
+       for (i = 0; i < lock_info->num_locks; i++) {
+               ast_log(LOG_ERROR, 
+                       "Thread '%s' still has a lock! - '%s' (%p) from '%s' in %s:%d!\n", 
+                       lock_info->thread_name,
+                       lock_info->locks[i].lock_name,
+                       lock_info->locks[i].lock_addr,
+                       lock_info->locks[i].func,
+                       lock_info->locks[i].file,
+                       lock_info->locks[i].line_num
+               );
+       }
+
        pthread_mutex_destroy(&lock_info->lock);
        free((void *) lock_info->thread_name);
        free(lock_info);