diff options
| author | Mark Michelson <mmichelson@digium.com> | 2007-12-18 17:05:19 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2007-12-18 17:05:19 +0000 |
| commit | 5e7f1670737dfe53bcb093a481263ceb86fc1392 (patch) | |
| tree | fcdcc5a9d91d626f483de6ca043064ebec689b13 /main/channel.c | |
| parent | 10f70a8321d064d77106d056a361876d4d36628d (diff) | |
Merged revisions 93625 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r93625 | mmichelson | 2007-12-18 11:02:48 -0600 (Tue, 18 Dec 2007) | 6 lines
Rework deadlock avoidance used in ast_write, since it meant that agent channels which were being monitored
had one audio file recorded and one empty audio file saved.
(closes issue #11529, reported by atis patched by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/main/channel.c b/main/channel.c index f08f4624e..ebcefccc0 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2740,9 +2740,18 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) { int res = -1; struct ast_frame *f = NULL, *f2 = NULL; + int count = 0; + /*Deadlock avoidance*/ + while(ast_channel_trylock(chan)) { + /*cannot goto done since the channel is not locked*/ + if(count++ > 10) { + ast_debug(1, "Deadlock avoided for write to channel '%s'\n", chan->name); + return 0; + } + usleep(1); + } /* Stop if we're a zombie or need a soft hangup */ - ast_channel_lock(chan); if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) goto done; @@ -2886,20 +2895,9 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) } } - if (f) { - struct ast_channel *base = NULL; - if (!chan->tech->get_base_channel || chan == chan->tech->get_base_channel(chan)) - res = chan->tech->write(chan, f); - else { - while (chan->tech->get_base_channel && (((base = chan->tech->get_base_channel(chan)) && ast_channel_trylock(base)) || base == NULL)) { - ast_channel_unlock(chan); - usleep(1); - ast_channel_lock(chan); - } - res = base->tech->write(base, f); - ast_channel_unlock(base); - } - } else + if (f) + res = chan->tech->write(chan,f); + else res = 0; break; case AST_FRAME_NULL: |