From 6a4d64e3efa12ea468993aac9388d06c167e7b37 Mon Sep 17 00:00:00 2001 From: rizzo Date: Thu, 15 Nov 2007 16:20:47 +0000 Subject: access channel locks through ast_channel_lock/unlock/trylock and not through ast_mutex primitives. To detect all occurrences, I have renamed the lock field in struct ast_channel so it is clear that it shouldn't be used directly. There are some uses in res/res_features.c (see details of the diff) that are error prone as they try and lock two channels without caring about the order (or without explaining why it is safe). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89293 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/lock.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/asterisk/lock.h') diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index c04d00aaa..52164ed03 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1167,13 +1167,13 @@ AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p), #ifndef DEBUG_CHANNEL_LOCKS /*! \brief Lock a channel. If DEBUG_CHANNEL_LOCKS is defined in the Makefile, print relevant output for debugging */ -#define ast_channel_lock(x) ast_mutex_lock(&x->lock) +#define ast_channel_lock(x) ast_mutex_lock(&x->lock_dont_use) /*! \brief Unlock a channel. If DEBUG_CHANNEL_LOCKS is defined in the Makefile, print relevant output for debugging */ -#define ast_channel_unlock(x) ast_mutex_unlock(&x->lock) +#define ast_channel_unlock(x) ast_mutex_unlock(&x->lock_dont_use) /*! \brief Try locking a channel. If DEBUG_CHANNEL_LOCKS is defined in the Makefile, print relevant output for debugging */ -#define ast_channel_trylock(x) ast_mutex_trylock(&x->lock) +#define ast_channel_trylock(x) ast_mutex_trylock(&x->lock_dont_use) #else struct ast_channel; -- cgit v1.2.3