[svn-commits] russell: trunk r45442 - in /trunk: ./ main/channel.c

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Oct 17 21:46:39 2006
New Revision: 45442

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

........
r45441 | russell | 2006-10-17 22:41:36 -0400 (Tue, 17 Oct 2006) | 7 lines

Don't attempt to access private data members of the pthread_mutex_t object,
because this does not work on all linux systems.  Instead, just access
the reentrancy field in the ast_mutex_info struct when DEBUG_THREADS is
enabled.  If DEBUG_CHANNEL_LOCKS is enabled, the developer probably has
DEBUG_THREADS on as well.
(issue #8139, me)

........

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

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?rev=45442&r1=45441&r2=45442&view=diff
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Oct 17 21:46:39 2006
@@ -4496,17 +4496,9 @@
 	res = ast_mutex_unlock(&chan->lock);
 
 	if (option_debug > 2) {
-		/* Try to find counter if possible on your platform 
-			I've only found out how to do this on Linux
-			DEBUG_THREADS changes the lock structure
-		*/
-#ifdef __linux__
+#ifdef DEBUG_THREADS
 		int count = 0;
-#ifdef DEBUG_THREADS
-		if ((count = chan->lock.mutex.__data.__count))
-#else
-		if ((count = chan->lock.__data.__count))
-#endif
+		if ((count = chan->lock.reentrancy))
 			if (option_debug)
 				ast_log(LOG_DEBUG, ":::=== Still have %d locks (recursive)\n", count);
 #endif
@@ -4539,13 +4531,9 @@
 	res = ast_mutex_lock(&chan->lock);
 
 	if (option_debug > 3) {
-#ifdef __linux__
+#ifdef DEBUG_THREADS
 		int count = 0;
-#ifdef DEBUG_THREADS
-		if ((count = chan->lock.mutex.__data.__count))
-#else
-		if ((count = chan->lock.__data.__count))
-#endif
+		if ((count = chan->lock.reentrancy))
 			if (option_debug)
 				ast_log(LOG_DEBUG, ":::=== Now have %d locks (recursive)\n", count);
 #endif
@@ -4577,13 +4565,9 @@
 	res = ast_mutex_trylock(&chan->lock);
 
 	if (option_debug > 2) {
-#ifdef __linux__
+#ifdef DEBUG_THREADS
 		int count = 0;
-#ifdef DEBUG_THREADS
-		if ((count = chan->lock.mutex.__data.__count))
-#else
-		if ((count = chan->lock.__data.__count))
-#endif
+		if ((count = chan->lock.reentrancy))
 			if (option_debug)
 				ast_log(LOG_DEBUG, ":::=== Now have %d locks (recursive)\n", count);
 #endif