[svn-commits] russell: branch russell/sla_updates r57316 - /team/russell/sla_updates/includ...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Thu Mar 1 15:10:37 MST 2007


Author: russell
Date: Thu Mar  1 16:10:36 2007
New Revision: 57316

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57316
Log:
Make the message in CHECK_BLOCKING() a DEBUG message, since that is all it is.

Modified:
    team/russell/sla_updates/include/asterisk/channel.h

Modified: team/russell/sla_updates/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/russell/sla_updates/include/asterisk/channel.h?view=diff&rev=57316&r1=57315&r2=57316
==============================================================================
--- team/russell/sla_updates/include/asterisk/channel.h (original)
+++ team/russell/sla_updates/include/asterisk/channel.h Thu Mar  1 16:10:36 2007
@@ -1308,15 +1308,16 @@
 #define CRASH do { } while(0)
 #endif
 
-#define CHECK_BLOCKING(c) { 	 \
-							if (ast_test_flag(c, AST_FLAG_BLOCKING)) {\
-								ast_log(LOG_WARNING, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \
-								CRASH; \
-							} else { \
-								(c)->blocker = pthread_self(); \
-								(c)->blockproc = __PRETTY_FUNCTION__; \
-									ast_set_flag(c, AST_FLAG_BLOCKING); \
-									} }
+#define CHECK_BLOCKING(c) do { 	 \
+	if (ast_test_flag(c, AST_FLAG_BLOCKING)) {\
+		if (option_debug) \
+			ast_log(LOG_DEBUG, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \
+		CRASH; \
+	} else { \
+		(c)->blocker = pthread_self(); \
+		(c)->blockproc = __PRETTY_FUNCTION__; \
+		ast_set_flag(c, AST_FLAG_BLOCKING); \
+	} } while (0)
 
 ast_group_t ast_get_group(const char *s);
 



More information about the svn-commits mailing list