summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-07-10 21:01:39 +0100
committerWim Taymans <wim@metal.(none)>2009-07-10 21:01:39 +0100
commit084357dfb85a5ebebf69ca0577aaec59487253de (patch)
tree515d1c328c70427d303109c081f7424e94a59c47
parent40f404ad903df484c3b9770015e2288ff141f60d (diff)
queue2: flush differently, avoiding deadlocks
Don't flush the file by closing and opening it but instead use g_freopen. This avoids a deadlock in shutdown because we emit the temp-location property change with the wrong lock held.
-rw-r--r--gst/playback/gstqueue2.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/gst/playback/gstqueue2.c b/gst/playback/gstqueue2.c
index 538f80985..47a0a842b 100644
--- a/gst/playback/gstqueue2.c
+++ b/gst/playback/gstqueue2.c
@@ -1089,11 +1089,24 @@ gst_queue_close_temp_location_file (GstQueue * queue)
}
static void
+gst_queue_flush_temp_file (GstQueue * queue)
+{
+ if (queue->temp_file == NULL)
+ return;
+
+ GST_DEBUG_OBJECT (queue, "flushing temp file");
+
+ queue->temp_file = g_freopen (queue->temp_location, "wb+", queue->temp_file);
+
+ queue->writing_pos = 0;
+ queue->reading_pos = 0;
+}
+
+static void
gst_queue_locked_flush (GstQueue * queue)
{
if (QUEUE_IS_USING_TEMP_FILE (queue)) {
- gst_queue_close_temp_location_file (queue);
- gst_queue_open_temp_location_file (queue);
+ gst_queue_flush_temp_file (queue);
} else {
while (!g_queue_is_empty (queue->queue)) {
GstMiniObject *data = g_queue_pop_head (queue->queue);