diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-17 15:27:27 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-17 15:27:27 +0000 |
| commit | e01c957b3b5afbdfbf063e8998424bbc42ab73f8 (patch) | |
| tree | 62b994b0c2e95602775fc0642aae040a1c21e7ce | |
| parent | 75f9f51f1b7753730a6abe776ebd9c6162c51694 (diff) | |
Merged revisions 182553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r182553 | russell | 2009-03-17 10:22:12 -0500 (Tue, 17 Mar 2009) | 5 lines
Tweak the handling of the frame list inside of ast_answer().
This does not change any behavior, but moves the frames from the local frame
list back to the channel read queue using an O(n) algorithm instead of O(n^2).
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@182569 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c index 3adcf220b..710d1066e 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1788,7 +1788,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer) ast_frfree(cur); } - AST_LIST_INSERT_TAIL(&frames, new, frame_list); + AST_LIST_INSERT_HEAD(&frames, new, frame_list); /* if a specific delay period was requested, continue * until that delay has passed. don't stop just because @@ -1824,8 +1824,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer) if (res == 0) { ast_channel_lock(chan); - while ((cur = AST_LIST_LAST(&frames))) { - AST_LIST_REMOVE(&frames, cur, frame_list); + while ((cur = AST_LIST_REMOVE_HEAD(&frames, frame_list))) { ast_queue_frame_head(chan, cur); ast_frfree(cur); } |