[asterisk-commits] russell: trunk r91077 - in /trunk: ./ main/utils.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Dec  4 18:49:19 2007
New Revision: 91077

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91077
Log:
Merged revisions 91074 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r91074 | russell | 2007-12-04 18:48:47 -0600 (Tue, 04 Dec 2007) | 4 lines

When DEBUG_THREADS is enabled, we only have the details about who is holding
a lock that we are waiting on for a mutex, not rwlocks.  This should fix the
problem where people have reported "core show locks" crashing sometimes.

........

Modified:
    trunk/   (props changed)
    trunk/main/utils.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/utils.c
URL: http://svn.digium.com/view/asterisk/trunk/main/utils.c?view=diff&rev=91077&r1=91076&r2=91077
==============================================================================
--- trunk/main/utils.c (original)
+++ trunk/main/utils.c Tue Dec  4 18:49:19 2007
@@ -756,6 +756,10 @@
 			if (!lock_info->locks[i].pending)
 				continue;
 
+			/* We only have further details for mutexes right now */
+			if (lock_info->locks[i].type != AST_MUTEX)
+				continue;
+
 			lock = lock_info->locks[i].lock_addr;
 
 			ast_reentrancy_lock(lock);