Add some debugging code that ensures that when we do deadlock avoidance, we

don't lose the information about how a lock was originally acquired.


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@118953 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 3 deletions

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index d5817493f..c45740ef1 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -506,9 +506,7 @@ static int alsa_text(struct ast_channel *c, const char *text)
 static void grab_owner(void)
 {
 	while (alsa.owner && ast_mutex_trylock(&alsa.owner->lock)) {
-		ast_mutex_unlock(&alsalock);
-		usleep(1);
-		ast_mutex_lock(&alsalock);
+		DEADLOCK_AVOIDANCE(&alsalock);
 	}
 }