Merged revisions 164881 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 16 Dec 2008 21:39:15 +0000 (21:39 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 16 Dec 2008 21:39:15 +0000 (21:39 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r164881 | russell | 2008-12-16 15:38:29 -0600 (Tue, 16 Dec 2008) | 9 lines

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/trunk@164882 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/utils.c

index e3d64c3..64a5475 100644 (file)
@@ -520,6 +520,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,