[asterisk-commits] rmudgett: trunk r380613 - in /trunk: ./ include/asterisk/channel.h

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan 30 18:37:03 2013
New Revision: 380613

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380613
Log:
Make CHECK_BLOCKING() debug message more useful.

Change the displayed pthread value to hex format so it can be easily
matched with CLI core show threads or gdb.
........

Merged revisions 380611 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 380612 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/channel.h

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

Modified: trunk/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=380613&r1=380612&r2=380613
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Wed Jan 30 18:37:03 2013
@@ -2462,7 +2462,8 @@
 
 #define CHECK_BLOCKING(c) do { 	 \
 	if (ast_test_flag(ast_channel_flags(c), AST_FLAG_BLOCKING)) {\
-		ast_debug(1, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), ast_channel_name(c), (long) ast_channel_blocker(c), ast_channel_blockproc(c)); \
+		ast_debug(1, "Thread %p is blocking '%s', already blocked by thread %p in procedure %s\n", \
+			(void *) pthread_self(), ast_channel_name(c), (void *) ast_channel_blocker(c), ast_channel_blockproc(c)); \
 	} else { \
 		ast_channel_blocker_set((c), pthread_self()); \
 		ast_channel_blockproc_set((c), __PRETTY_FUNCTION__); \