kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 141949 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2008-09-09 01:49:25 +00:00
parent 1be1e4b5e4
commit 449cf2d24a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/channel.c
View File

@@ -1689,16 +1689,21 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
return -1; return -1;
} }
ast_channel_unlock(chan);
switch (chan->_state) { switch (chan->_state) {
case AST_STATE_RINGING: case AST_STATE_RINGING:
case AST_STATE_RING: case AST_STATE_RING:
if (chan->tech->answer) ast_channel_lock(chan);
if (chan->tech->answer) {
res = chan->tech->answer(chan); res = chan->tech->answer(chan);
}
ast_setstate(chan, AST_STATE_UP); ast_setstate(chan, AST_STATE_UP);
ast_cdr_answer(chan->cdr); ast_cdr_answer(chan->cdr);
if (delay) ast_channel_unlock(chan);
if (delay) {
ast_safe_sleep(chan, delay); ast_safe_sleep(chan, delay);
else { } else {
struct ast_frame *f; struct ast_frame *f;
int ms = ANSWER_WAIT_MS; int ms = ANSWER_WAIT_MS;
while (1) { while (1) {
@@ -1734,8 +1739,8 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
default: default:
break; break;
} }
chan->visible_indication = 0; chan->visible_indication = 0;
ast_channel_unlock(chan);
return res; return res;
} }