Attachment 114465 Details for Bug 89673 – nicesrc: Keep the mutex locked whenever accessing the queue

[patch] nicesrc: Keep the mutex locked whenever accessing the queue

nicesrc-Keep-the-mutex-locked-whenever-accessing-t.patch (text/plain), 1.36 KB, created by Sebastian Dröge (slomo) on 2015-03-19 09:37:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Dröge (slomo)

Created: 2015-03-19 09:37:41 UTC

Size: 1.36 KB

patch

obsolete

>From 38c0c89948b95b0e02b9f7e3f65c9f7537dc5b83 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
>Date: Thu, 19 Mar 2015 09:17:38 +0100
>Subject: [PATCH] nicesrc: Keep the mutex locked whenever accessing the queue
>
>https://bugs.freedesktop.org/show_bug.cgi?id=89673
>---
> gst/gstnicesrc.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/gst/gstnicesrc.c b/gst/gstnicesrc.c
>index 0c75c18..7d1ffa8 100644
>--- a/gst/gstnicesrc.c
>+++ b/gst/gstnicesrc.c
>@@ -205,9 +205,10 @@ gst_nice_src_read_callback (NiceAgent *agent,
>   buffer = gst_buffer_new_and_alloc (len);
>   memcpy (GST_BUFFER_DATA (buffer), buf, len);
> #endif
>+  GST_OBJECT_LOCK (nicesrc);
>   g_queue_push_tail (nicesrc->outbufs, buffer);
>-
>   g_main_loop_quit (nicesrc->mainloop);
>+  GST_OBJECT_UNLOCK (nicesrc);
> }
> 
> static gboolean
>@@ -285,12 +286,15 @@ gst_nice_src_create (
>     return GST_FLOW_WRONG_STATE;
> #endif
>   }
>-  GST_OBJECT_UNLOCK (basesrc);
>-
>-  if (g_queue_is_empty (nicesrc->outbufs))
>+  if (g_queue_is_empty (nicesrc->outbufs)) {
>+    GST_OBJECT_UNLOCK (basesrc);
>     g_main_loop_run (nicesrc->mainloop);
>+    GST_OBJECT_LOCK (basesrc);
>+  }
> 
>   *buffer = g_queue_pop_head (nicesrc->outbufs);
>+  GST_OBJECT_UNLOCK (basesrc);
>+
>   if (*buffer != NULL) {
>     GST_LOG_OBJECT (nicesrc, "Got buffer, pushing");
>     return GST_FLOW_OK;
>-- 
>2.1.4

Actions: View | Splinter Review

Attachments on bug 89673: 114465 | 114466 | 114467

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.