kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 125740 via svnmerge from

Browse Source 
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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-27 12:28:38 +00:00
parent e08829764c
commit 2dc4597f79
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
channels/chan_local.c
View File

@@ -219,13 +219,15 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
/* Ensure that we have both channels locked */ /* Ensure that we have both channels locked */
while (other && ast_channel_trylock(other)) { while (other && ast_channel_trylock(other)) {
DLA_UNLOCK(&p->lock); ast_mutex_unlock(&p->lock);
if (us && us_locked) { if (us && us_locked) {
CHANNEL_DEADLOCK_AVOIDANCE(us); do {
CHANNEL_DEADLOCK_AVOIDANCE(us);
} while (ast_mutex_trylock(&p->lock));
} else { } else {
usleep(1); usleep(1);
ast_mutex_lock(&p->lock);
} }
DLA_LOCK(&p->lock);
other = isoutbound ? p->owner : p->chan; other = isoutbound ? p->owner : p->chan;
} }
@@ -542,7 +544,12 @@ static int local_hangup(struct ast_channel *ast)
if (!p) if (!p)
return -1; 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)) if (p->chan && ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE))
ast_set_flag(p->chan, AST_FLAG_ANSWERED_ELSEWHERE); ast_set_flag(p->chan, AST_FLAG_ANSWERED_ELSEWHERE);
isoutbound = IS_OUTBOUND(ast, p); isoutbound = IS_OUTBOUND(ast, p);