From 449cf2d24aebea8f3793db3e8f1d98b09917583b Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 9 Sep 2008 01:49:25 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@141950 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/main/channel.c b/main/channel.c index f096b9a1cc..fbd4170129 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1689,16 +1689,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) { @@ -1734,8 +1739,8 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay) default: break; } + chan->visible_indication = 0; - ast_channel_unlock(chan); return res; }