mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-15 22:01:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

multiqueue: don't lock multiqueue when pushing serialized queries

Browse source 
If we are pushing a serialized query into a queue and the queue is
filled, we will end in a deadlock. We need to release the lock before
pushing and acquire it again afterward.

https://bugzilla.gnome.org/show_bug.cgi?id=737794
This commit is contained in:
Aleix Conchillo Flaqué 2014-10-08 09:37:41 -07:00 committed by Sebastian Dröge
parent 2096f51ccc
commit e014bac42b
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/elements/gstmultiqueue.c
View file

@ -171,6 +171,7 @@ struct _GstSingleQueue
/* for serialized queries */ /* for serialized queries */
GCond query_handled; GCond query_handled;
gboolean last_query; gboolean last_query;
GstQuery *last_handled_query;
}; };
@ -1264,6 +1265,7 @@ gst_single_queue_push_one (GstMultiQueue * mq, GstSingleQueue * sq,
GST_MULTI_QUEUE_MUTEX_LOCK (mq); GST_MULTI_QUEUE_MUTEX_LOCK (mq);
sq->last_query = res; sq->last_query = res;
sq->last_handled_query = query;
g_cond_signal (&sq->query_handled); g_cond_signal (&sq->query_handled);
GST_MULTI_QUEUE_MUTEX_UNLOCK (mq); GST_MULTI_QUEUE_MUTEX_UNLOCK (mq);
} else { } else {
@ -1857,9 +1859,19 @@ gst_multi_queue_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
GST_DEBUG_OBJECT (mq, GST_DEBUG_OBJECT (mq,
"SingleQueue %d : Enqueuing query %p of type %s with id %d", "SingleQueue %d : Enqueuing query %p of type %s with id %d",
sq->id, query, GST_QUERY_TYPE_NAME (query), curid); sq->id, query, GST_QUERY_TYPE_NAME (query), curid);
GST_MULTI_QUEUE_MUTEX_UNLOCK (mq);
res = gst_data_queue_push (sq->queue, (GstDataQueueItem *) item); res = gst_data_queue_push (sq->queue, (GstDataQueueItem *) item);
g_cond_wait (&sq->query_handled, &mq->qlock); GST_MULTI_QUEUE_MUTEX_LOCK (mq);
/* it might be that the query has been taken out of the queue
* while we were unlocked. So, we need to check if the last
* handled query is the same one than the one we just
* pushed. If it is, we don't need to wait for the condition
* variable, otherwise we wait for the condition variable to
* be signaled. */
if (sq->last_handled_query != query)
g_cond_wait (&sq->query_handled, &mq->qlock);
res = sq->last_query; res = sq->last_query;
sq->last_handled_query = NULL;
} else { } else {
GST_DEBUG_OBJECT (mq, "refusing query, we are buffering and the " GST_DEBUG_OBJECT (mq, "refusing query, we are buffering and the "
"queue is not empty"); "queue is not empty");