[asterisk-commits] Revert "channel: Use frame deferral API for safe sleep." (asterisk[master])

[SVN commits to the Asterisk project]

George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/4365 )

Change subject: Revert "channel: Use frame deferral API for safe sleep."
......................................................................


Revert "channel: Use frame deferral API for safe sleep."

This reverts commit 392202304d248147378f1e16f1f012285dc1221f.

Multiple testsuite issues were discovered after the fact.

Change-Id: I848c4196dca2994b1a368087004326ea354cff95
---
M main/channel.c
1 file changed, 27 insertions(+), 6 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved; Verified



diff --git a/main/channel.c b/main/channel.c
index 872661c..b30bb1d 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1544,18 +1544,19 @@
 	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;
 		}
@@ -1570,7 +1571,18 @@
 				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);
+			}
 		}
 	}
 
@@ -1579,8 +1591,17 @@
 		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;

-- 
To view, visit https://gerrit.asterisk.org/4365
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I848c4196dca2994b1a368087004326ea354cff95
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>