Revert "channel: Use frame deferral API for safe sleep."
authorGeorge Joseph <gjoseph@digium.com>
Thu, 10 Nov 2016 13:31:52 +0000 (08:31 -0500)
committerGeorge Joseph <gjoseph@digium.com>
Thu, 10 Nov 2016 13:31:52 +0000 (08:31 -0500)
This reverts commit 392202304d248147378f1e16f1f012285dc1221f.

Multiple testsuite issues were discovered after the fact.

Change-Id: I848c4196dca2994b1a368087004326ea354cff95

main/channel.c

index 872661c..b30bb1d 100644 (file)
@@ -1544,18 +1544,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;
                }
@@ -1570,7 +1571,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);
+                       }
                }
        }
 
@@ -1579,8 +1591,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;