kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 164882 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r164882 | russell | 2008-12-16 15:39:15 -0600 (Tue, 16 Dec 2008) | 17 lines

Merged revisions 164881 via svnmerge from 
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/branches/1.6.1@164884 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-12-16 21:40:30 +00:00
parent 57bb6ea061
commit 4468cd8d49
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/utils.c
View 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,