From 63444acf6b7be28277d5be6486b205f3295e637b Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 16 Dec 2008 21:38:29 +0000 Subject: [PATCH] Fix an issue where DEBUG_THREADS may erroneously report that a thread is exiting while holding a lock. If the last lock attempt was a trylock, and it failed, it will still be in the list of locks so that it can be reported. (closes issue #13219) Reported by: pj git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@164881 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/main/utils.c b/main/utils.c index a8d15bba0c..bbebe8b350 100644 --- a/main/utils.c +++ b/main/utils.c @@ -515,6 +515,12 @@ static void lock_info_destroy(void *data) for (i = 0; i < lock_info->num_locks; i++) { + if (lock_info->locks[i].pending == -1) { + /* This just means that the last lock this thread went for was by + * using trylock, and it failed. This is fine. */ + break; + } + ast_log(LOG_ERROR, "Thread '%s' still has a lock! - '%s' (%p) from '%s' in %s:%d!\n", lock_info->thread_name, -- 2.47.3