From 96048caf413fd8aa5c402fefef2eb14d0b6022d2 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 25 Jul 2006 19:43:38 +0000 Subject: [PATCH] This resolves a deadlock that a tech support customer was getting frequently when his users would answer call waiting. If another thread is currently holding the zt_pvt lock for the first channel, unlock both channels and let asterisk retry the native bridge, just like what is done for the second channel directly below these changes. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@38200 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 8f69f886f3..2cd028a01f 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3047,7 +3047,13 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann oc0 = p0->owner; oc1 = p1->owner; - ast_mutex_lock(&p0->lock); + if (ast_mutex_trylock(&p0->lock)) { + /* Don't block, due to potential for deadlock */ + ast_mutex_unlock(&c0->lock); + ast_mutex_unlock(&c1->lock); + ast_log(LOG_NOTICE, "Avoiding deadlock...\n"); + return AST_BRIDGE_RETRY; + } if (ast_mutex_trylock(&p1->lock)) { /* Don't block, due to potential for deadlock */ ast_mutex_unlock(&p0->lock); -- 2.47.2