diff options
| author | Russell Bryant <russell@russellbryant.com> | 2009-03-17 15:22:12 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2009-03-17 15:22:12 +0000 |
| commit | 9d6ba51d054d2010f73c806ee47e90c9277ffca1 (patch) | |
| tree | 0c36362c6bc622c2e23f253e546f6fad7fd1b684 | |
| parent | 16b9280ba99887380c32c8291cfe8425807b6393 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@182553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -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 8f90dcc29..782629312 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1801,7 +1801,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 @@ -1837,8 +1837,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); } |