diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-09 01:50:48 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-09 01:50:48 +0000 |
| commit | 12c2b7e7445b105ce186200ed828275aea70dc9e (patch) | |
| tree | 72a113074dbb38b11134d9770f133df1ef03367a | |
| parent | 95f8f4f8fcb6f5fb24b9481b1f06c4c48bb389ce (diff) | |
Merged revisions 141949 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r141949 | russell | 2008-09-08 20:47:56 -0500 (Mon, 08 Sep 2008) | 9 lines
Modify ast_answer() to not hold the channel lock while calling ast_safe_sleep()
or when calling ast_waitfor(). These are inappropriate times to hold the channel
lock. This is what has caused "could not get the channel lock" messages from
chan_sip and has likely caused a negative impact on performance results of SIP
in Asterisk 1.6. Thanks to file for pointing out this section of code.
(closes issue #13287)
(closes issue #13115)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@141951 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/main/channel.c b/main/channel.c index b19c4c929..fd496e5f0 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1674,16 +1674,21 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay) return -1; } + ast_channel_unlock(chan); + switch (chan->_state) { case AST_STATE_RINGING: case AST_STATE_RING: - if (chan->tech->answer) + ast_channel_lock(chan); + if (chan->tech->answer) { res = chan->tech->answer(chan); + } ast_setstate(chan, AST_STATE_UP); ast_cdr_answer(chan->cdr); - if (delay) + ast_channel_unlock(chan); + if (delay) { ast_safe_sleep(chan, delay); - else { + } else { struct ast_frame *f; int ms = ANSWER_WAIT_MS; while (1) { @@ -1719,8 +1724,8 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay) default: break; } + chan->visible_indication = 0; - ast_channel_unlock(chan); return res; } |