[svn-commits] tilghman: branch 1.6.0 r125742 - in /branches/1.6.0: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jun 27 07:32:02 2008
New Revision: 125742

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125742
Log:
Merged revisions 125741 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r125741 | tilghman | 2008-06-27 07:28:38 -0500 (Fri, 27 Jun 2008) | 15 lines

Merged revisions 125740 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r125740 | tilghman | 2008-06-27 07:19:39 -0500 (Fri, 27 Jun 2008) | 7 lines

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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_local.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_local.c?view=diff&rev=125742&r1=125741&r2=125742
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Fri Jun 27 07:32:02 2008
@@ -193,13 +193,13 @@
 	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);
-		}
-		ast_mutex_lock(&p->lock);
+			do {
+				CHANNEL_DEADLOCK_AVOIDANCE(us);
+			} while (ast_mutex_trylock(&p->lock));
+		} else {
+			usleep(1);
+			ast_mutex_lock(&p->lock);
+		}
 		other = isoutbound ? p->owner : p->chan;
 	}
 
@@ -516,7 +516,12 @@
 	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);
+	}
+
 	if (p->chan && ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE)) 
 		ast_set_flag(p->chan, AST_FLAG_ANSWERED_ELSEWHERE);
 	isoutbound = IS_OUTBOUND(ast, p);