From: Luigi Rizzo <rizzo@icir.org>
Date: Sat, 24 Nov 2007 13:57:46 +0000 (+0000)
Subject: remove a DEBUG_THREADS message that accesses private lock fields.
X-Git-Tag: 1.6.0-beta1~3^2~686
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce7120b7d597a53ffff65bc40654ea3fc3bead5c;p=thirdparty%2Fasterisk.git

remove a DEBUG_THREADS message that accesses private lock fields.
If needed, the code to extract this information should be implemented
in some generic header or library and the function called here.

(closed bug #11362)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89543 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index b17965bdb6..6c5e7a35e2 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -2357,10 +2357,13 @@ static void cleanup_connection(unsigned call_reference, const char *call_token)
 		if (!pvt->owner || !ast_channel_trylock(pvt->owner))
 			break;
 #if 1
-#ifdef DEBUG_THREADS
-		ast_log(LOG_NOTICE, "Avoiding H.323 destory deadlock on %s, locked at %ld/%d by %s (%s:%d)\n", call_token, pvt->owner->lock.thread[0], pvt->owner->lock.reentrancy, pvt->owner->lock.func[0], pvt->owner->lock.file[0], pvt->owner->lock.lineno[0]);
-#else
 		ast_log(LOG_NOTICE, "Avoiding H.323 destory deadlock on %s\n", call_token);
+#ifdef DEBUG_THREADS
+		/* XXX to be completed
+		 * If we want to print more info on who is holding the lock,
+		 * implement the relevant code in lock.h and use the routines
+		 * supplied there.
+		 */
 #endif
 #endif
 		ast_mutex_unlock(&pvt->lock);