diff options
author | George Joseph <gjoseph@digium.com> | 2016-11-10 08:37:19 -0500 |
---|---|---|
committer | George Joseph <gjoseph@digium.com> | 2016-11-10 08:37:19 -0500 |
commit | 97679ee846893823cdbfd95d91cecc3c14048601 (patch) | |
tree | b94902e275759906084dee1530d6648c75ff9a25 | |
parent | 1db9e7886cc72355663123e906cf5f2dc4a2ef84 (diff) |
Revert "channel: Use frame deferral API for safe sleep."
This reverts commit 1db9e7886cc72355663123e906cf5f2dc4a2ef84.
Multiple testsuite failures were detected after the fact.
Change-Id: Ifd5817e90371e05c4011d5cc97da145c196d60fe
-rw-r--r-- | main/channel.c | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/main/channel.c b/main/channel.c index 0d13be13b..9ac8a640f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1546,18 +1546,19 @@ int ast_safe_sleep_conditional(struct ast_channel *chan, int timeout_ms, int (*c int res = 0; struct timeval start; int ms; + AST_LIST_HEAD_NOLOCK(, ast_frame) deferred_frames; + + AST_LIST_HEAD_INIT_NOLOCK(&deferred_frames); /* If no other generator is present, start silencegen while waiting */ if (ast_opt_transmit_silence && !ast_channel_generatordata(chan)) { silgen = ast_channel_start_silence_generator(chan); } - ast_channel_lock(chan); - ast_channel_start_defer_frames(chan); - ast_channel_unlock(chan); - start = ast_tvnow(); while ((ms = ast_remaining_ms(start, timeout_ms))) { + struct ast_frame *dup_f = NULL; + if (cond && ((*cond)(data) == 0)) { break; } @@ -1572,7 +1573,18 @@ int ast_safe_sleep_conditional(struct ast_channel *chan, int timeout_ms, int (*c res = -1; break; } - ast_frfree(f); + + if (!ast_is_deferrable_frame(f)) { + ast_frfree(f); + continue; + } + + if ((dup_f = ast_frisolate(f))) { + if (dup_f != f) { + ast_frfree(f); + } + AST_LIST_INSERT_HEAD(&deferred_frames, dup_f, frame_list); + } } } @@ -1581,8 +1593,17 @@ int ast_safe_sleep_conditional(struct ast_channel *chan, int timeout_ms, int (*c ast_channel_stop_silence_generator(chan, silgen); } + /* We need to free all the deferred frames, but we only need to + * queue the deferred frames if there was no error and no + * hangup was received + */ ast_channel_lock(chan); - ast_channel_stop_defer_frames(chan); + while ((f = AST_LIST_REMOVE_HEAD(&deferred_frames, frame_list))) { + if (!res) { + ast_queue_frame_head(chan, f); + } + ast_frfree(f); + } ast_channel_unlock(chan); return res; |