kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework deadlock avoidance used in ast_write, since it meant that agent channels which were being monitored

Browse Source 
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/branches/1.4@93625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-12-18 17:02:48 +00:00
parent 6fa23de8ac
commit 62fa8dfbfa
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main/channel.c
View File

@@ -2805,10 +2805,20 @@ int ast_write_video(struct ast_channel *chan, struct ast_frame *fr)
int ast_write(struct ast_channel *chan, struct ast_frame *fr)
{
int res = -1;
int count = 0;
struct ast_frame *f = NULL;
/*Deadlock avoidance*/
while(ast_channel_trylock(chan)) {
/*cannot goto done since the channel is not locked*/
if(count++ > 10) {
if(option_debug)
ast_log(LOG_DEBUG, "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;
@@ -2973,20 +2983,9 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
/* and now put it through the regular translator */
f = (chan->writetrans) ? ast_translate(chan->writetrans, f, 0) : f;
}
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_mutex_trylock(&base->lock)) || base == NULL)) {
ast_mutex_unlock(&chan->lock);
usleep(1);
ast_mutex_lock(&chan->lock);
}
res = base->tech->write(base, f);
ast_mutex_unlock(&base->lock);
}
} else
if (f)
res = chan->tech->write(chan,f);
else
res = 0;
break;
case AST_FRAME_NULL: