Merge revision 124064 from trunk. Add errors that report any locks held by threads when they are being closed.

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@124066 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 14 insertions, 0 deletions

diff --git a/main/utils.c b/main/utils.c
index 7b6e64812..937383c70 100644
--- 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);