[asterisk-commits] russell: branch russell/ast_channel_ao2 r189733 - /team/russell/ast_channel_a...

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Apr 21 12:17:14 2009
New Revision: 189733

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189733
Log:
fix debug threads build

Modified:
    team/russell/ast_channel_ao2/include/asterisk/lock.h

Modified: team/russell/ast_channel_ao2/include/asterisk/lock.h
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/include/asterisk/lock.h?view=diff&rev=189733&r1=189732&r2=189733
==============================================================================
--- team/russell/ast_channel_ao2/include/asterisk/lock.h (original)
+++ team/russell/ast_channel_ao2/include/asterisk/lock.h Tue Apr 21 12:17:14 2009
@@ -53,7 +53,9 @@
 #ifdef HAVE_BKTR
 #include <execinfo.h>
 #endif
+
 #include "asterisk/logger.h"
+#include "asterisk/astobj2.h"
 
 /* internal macro to profile mutexes. Only computes the delay on
  * non-blocking calls.
@@ -267,13 +269,13 @@
 	do { \
 		char __filename[80], __func[80], __mutex_name[80]; \
 		int __lineno; \
-		int __res = ast_find_lock_info(&chan->lock_dont_use, __filename, sizeof(__filename), &__lineno, __func, sizeof(__func), __mutex_name, sizeof(__mutex_name)); \
+		int __res = ast_find_lock_info(ao2_object_get_lockaddr(chan), __filename, sizeof(__filename), &__lineno, __func, sizeof(__func), __mutex_name, sizeof(__mutex_name)); \
 		ast_channel_unlock(chan); \
 		usleep(1); \
 		if (__res < 0) { /* Shouldn't ever happen, but just in case... */ \
 			ast_channel_lock(chan); \
 		} else { \
-			_ao2_lock(chan, __filename, __func, __lineno, __mutex_name); \
+			__ao2_lock(chan, __filename, __func, __lineno, __mutex_name); \
 		} \
 	} while (0)