From: Richard Mudgett Date: Thu, 31 Jan 2013 00:37:03 +0000 (+0000) Subject: Make CHECK_BLOCKING() debug message more useful. X-Git-Tag: 13.0.0-beta1~2139 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3058e2fb2da56b73d39da4c6039aaf760040697b;p=thirdparty%2Fasterisk.git 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380613 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 858657ab05..a3974ee006 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -2462,7 +2462,8 @@ static inline enum ast_t38_state ast_channel_get_t38_state(struct ast_channel *c #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__); \