From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 27 Jun 2008 12:19:39 +0000 (+0000)
Subject: Add proper deadlock avoidance.
X-Git-Tag: 1.4.22-rc1~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=226a47ccfdc6fd29364aebff67bf9f0c31cf11bd;p=thirdparty%2Fasterisk.git

Add proper deadlock avoidance.
(closes issue #12914)
 Reported by: ozan
 Patches:
       20080625__bug12914.diff.txt uploaded by Corydon76 (license 14)
 Tested by: ozan


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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 294fbffca0..783e973e03 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -186,13 +186,15 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
 	while (other && ast_channel_trylock(other)) {
 		ast_mutex_unlock(&p->lock);
 		if (us && us_locked) {
-			ast_channel_unlock(us);
-		}
-		usleep(1);
-		if (us && us_locked) {
-			ast_channel_lock(us);
+			do {
+				ast_channel_unlock(us);
+				usleep(1);
+				ast_channel_lock(us);
+			} while (ast_mutex_trylock(&p->lock));
+		} else {
+			usleep(1);
+			ast_mutex_lock(&p->lock);
 		}
-		ast_mutex_lock(&p->lock);
 		other = isoutbound ? p->owner : p->chan;
 	}
 
@@ -510,7 +512,12 @@ static int local_hangup(struct ast_channel *ast)
 	if (!p)
 		return -1;
 
-	ast_mutex_lock(&p->lock);
+	while (ast_mutex_trylock(&p->lock)) {
+		ast_channel_unlock(ast);
+		usleep(1);
+		ast_channel_lock(ast);
+	}
+
 	isoutbound = IS_OUTBOUND(ast, p);
 	if (isoutbound) {
 		const char *status = pbx_builtin_getvar_helper(p->chan, "DIALSTATUS");