mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-07 15:02:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue2: release queue2 lock before notify

Browse source 
Make sure that we don't hold the lock when we notify the temp-location
property,

Fixes #631853
This commit is contained in:
Wim Taymans 2010-10-11 18:10:07 +02:00
parent 85a23c6f80
commit 62ffd66f10
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/elements/gstqueue2.c
View file

@ -1314,6 +1314,8 @@ gst_queue2_read_item_from_file (GstQueue2 * queue)
return item; return item;
} }
/* must be called with MUTEX_LOCK. Will briefly release the lock when notifying
* the temp filename. */
static gboolean static gboolean
gst_queue2_open_temp_location_file (GstQueue2 * queue) gst_queue2_open_temp_location_file (GstQueue2 * queue)
{ {
@ -1350,7 +1352,12 @@ gst_queue2_open_temp_location_file (GstQueue2 * queue)
g_free (queue->temp_location); g_free (queue->temp_location);
queue->temp_location = name; queue->temp_location = name;
GST_QUEUE2_MUTEX_UNLOCK (queue);
/* we can't emit the notify with the lock */
g_object_notify (G_OBJECT (queue), "temp-location"); g_object_notify (G_OBJECT (queue), "temp-location");
GST_QUEUE2_MUTEX_LOCK (queue);
} else { } else {
/* open the file for update/writing, this is deprecated but we still need to /* open the file for update/writing, this is deprecated but we still need to
* support it for API/ABI compatibility */ * support it for API/ABI compatibility */
@ -2712,6 +2719,7 @@ gst_queue2_src_activate_pull (GstPad * pad, gboolean active)
queue = GST_QUEUE2 (gst_pad_get_parent (pad)); queue = GST_QUEUE2 (gst_pad_get_parent (pad));
if (active) { if (active) {
GST_QUEUE2_MUTEX_LOCK (queue);
if (!QUEUE_IS_USING_QUEUE (queue)) { if (!QUEUE_IS_USING_QUEUE (queue)) {
if (QUEUE_IS_USING_TEMP_FILE (queue)) { if (QUEUE_IS_USING_TEMP_FILE (queue)) {
/* open the temp file now */ /* open the temp file now */
@ -2723,7 +2731,6 @@ gst_queue2_src_activate_pull (GstPad * pad, gboolean active)
result = TRUE; result = TRUE;
} }
GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "activating pull mode"); GST_DEBUG_OBJECT (queue, "activating pull mode");
init_ranges (queue); init_ranges (queue);
queue->srcresult = GST_FLOW_OK; queue->srcresult = GST_FLOW_OK;