[Spice-devel,spice-server,19/20] Free replay queues

Submitted by Frediano Ziglio on Nov. 24, 2016, 5:39 p.m.

Details

Message ID 20161124173907.3341-20-fziglio@redhat.com
State Accepted
Commit 4f301ea0e440d7e256303656eba9011f90423c3f
Headers show
Series "Start cleaning objects on destruction" ( rev: 1 ) in Spice

Not browsing as part of any series.

Commit Message

Frediano Ziglio Nov. 24, 2016, 5:39 p.m.
There could be still some data pending.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 server/tests/replay.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/server/tests/replay.c b/server/tests/replay.c
index 27fb9a8..2d3b5e1 100644
--- a/server/tests/replay.c
+++ b/server/tests/replay.c
@@ -302,6 +302,21 @@  static gboolean progress_timer(gpointer user_data)
     return TRUE;
 }
 
+static void free_queue(GAsyncQueue *queue)
+{
+    for (;;) {
+        QXLCommandExt *cmd = g_async_queue_try_pop(queue);
+        if (cmd == GINT_TO_POINTER(-1)) {
+            continue;
+        }
+        if (!cmd) {
+            break;
+        }
+        spice_replay_free_cmd(replay, cmd);
+    }
+    g_async_queue_unref(queue);
+}
+
 int main(int argc, char **argv)
 {
     GError *error = NULL;
@@ -440,9 +455,9 @@  int main(int argc, char **argv)
         g_print("Counted %d commands\n", ncommands);
 
     spice_server_destroy(server);
+    free_queue(display_queue);
+    free_queue(cursor_queue);
     end_replay();
-    g_async_queue_unref(display_queue);
-    g_async_queue_unref(cursor_queue);
 
     /* FIXME: there should be a way to join server threads before:
      * g_main_loop_unref(loop);