mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 05:35:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

harness: Fix MT issues when forwarding event/query to sink harness

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=761910
This commit is contained in:
Stian Selnes 2016-01-21 13:33:15 +01:00 committed by Tim-Philipp Müller
parent 7ae052e3eb
commit 336c7bb69c
2 changed files with 75 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libs/gst/check/gstharness.c
View file

@ -139,6 +139,8 @@ static void gst_harness_stress_free (GstHarnessThread * t);
#define HARNESS_KEY "harness"
#define HARNESS_REF "harness-ref"
#define HARNESS_LOCK(h) g_mutex_lock (&(h)->priv->priv_mutex)
#define HARNESS_UNLOCK(h) g_mutex_unlock (&(h)->priv->priv_mutex)
static GstStaticPadTemplate hsrctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
@ -184,6 +186,7 @@ struct _GstHarnessPrivate
gboolean blocking_push_mode;
GCond blocking_push_cond;
GMutex blocking_push_mutex;
GMutex priv_mutex;
GPtrArray *stress;
};
@ -245,11 +248,17 @@ gst_harness_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
break;
}
HARNESS_LOCK (h);
if (priv->forwarding && forward && priv->sink_forward_pad) {
gst_pad_push_event (priv->sink_forward_pad, event);
GstPad *fwdpad = gst_object_ref (priv->sink_forward_pad);
HARNESS_UNLOCK (h);
ret = gst_pad_push_event (fwdpad, event);
gst_object_unref (fwdpad);
HARNESS_LOCK (h);
} else {
g_async_queue_push (priv->sink_event_queue, event);
}
HARNESS_UNLOCK (h);
return TRUE;
}
@ -363,11 +372,14 @@ gst_harness_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
break;
case GST_QUERY_ALLOCATION:
{
HARNESS_LOCK (h);
if (priv->forwarding && priv->sink_forward_pad != NULL) {
GstPad *peer = gst_pad_get_peer (priv->sink_forward_pad);
g_assert (peer != NULL);
HARNESS_UNLOCK (h);
res = gst_pad_query (peer, query);
gst_object_unref (peer);
HARNESS_LOCK (h);
} else {
GstCaps *caps;
gboolean need_pool;
@ -384,6 +396,7 @@ gst_harness_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
GST_DEBUG_OBJECT (pad, "proposing allocation %" GST_PTR_FORMAT,
priv->propose_allocator);
}
HARNESS_UNLOCK (h);
break;
}
default:
@ -639,6 +652,7 @@ gst_harness_new_empty (void)
g_mutex_init (&priv->blocking_push_mutex);
g_cond_init (&priv->blocking_push_cond);
g_mutex_init (&priv->priv_mutex);
priv->stress = g_ptr_array_new_with_free_func (
(GDestroyNotify) gst_harness_stress_free);
@ -1044,6 +1058,7 @@ gst_harness_teardown (GstHarness * h)
g_cond_clear (&priv->blocking_push_cond);
g_mutex_clear (&priv->blocking_push_mutex);
g_mutex_clear (&priv->priv_mutex);
g_ptr_array_unref (priv->stress);
@ -1482,6 +1497,15 @@ gst_harness_set_forwarding (GstHarness * h, gboolean forwarding)
gst_harness_set_forwarding (h->sink_harness, forwarding);
}
static void
gst_harness_set_forward_pad (GstHarness * h, GstPad * fwdpad)
{
HARNESS_LOCK (h);
gst_object_replace ((GstObject **) &h->priv->sink_forward_pad,
(GstObject *) fwdpad);
HARNESS_UNLOCK (h);
}
/**
* gst_harness_create_buffer:
* @h: a #GstHarness
@ -2076,7 +2100,7 @@ gst_harness_add_src_harness (GstHarness * h,
gst_harness_teardown (h->src_harness);
h->src_harness = src_harness;
h->src_harness->priv->sink_forward_pad = gst_object_ref (h->srcpad);
gst_harness_set_forward_pad (h->src_harness, h->srcpad);
gst_harness_use_testclock (h->src_harness);
h->src_harness->priv->has_clock_wait = has_clock_wait;
gst_harness_set_forwarding (h->src_harness, h->priv->forwarding);
@ -2265,11 +2289,11 @@ gst_harness_add_sink_harness (GstHarness * h, GstHarness * sink_harness)
GstHarnessPrivate *priv = h->priv;
if (h->sink_harness) {
gst_object_replace ((GstObject **) &priv->sink_forward_pad, NULL);
gst_harness_set_forward_pad (h, NULL);
gst_harness_teardown (h->sink_harness);
}
h->sink_harness = sink_harness;
priv->sink_forward_pad = gst_object_ref (h->sink_harness->srcpad);
gst_harness_set_forward_pad (h, h->sink_harness->srcpad);
gst_harness_use_testclock (h->sink_harness);
if (priv->forwarding && h->sinkpad)
gst_pad_sticky_events_foreach (h->sinkpad, forward_sticky_events, h);

47
tests/check/libs/gstharness.c
View file

@ -117,6 +117,51 @@ GST_START_TEST(test_add_sink_harness_without_sinkpad)
}
GST_END_TEST;
static GstEvent *
create_new_stream_start_event (GstHarness *h, gpointer data)
{
guint *counter = data;
gchar *stream_id = g_strdup_printf ("streamid/%d", *counter);
GstEvent *event = gst_event_new_stream_start (stream_id);
g_free (stream_id);
(*counter)++;
return event;
}
static void
push_query (gpointer data, gpointer user_data)
{
GstHarness *h = user_data;
GstCaps *caps = gst_caps_new_empty_simple ("mycaps");
GstQuery *query = gst_query_new_allocation (caps, FALSE);
gst_caps_unref (caps);
gst_pad_peer_query (h->srcpad, query);
gst_query_unref (query);
}
GST_START_TEST (test_forward_event_and_query_to_sink_harness_while_teardown)
{
GstHarness *h = gst_harness_new ("identity");
guint counter = 0;
GstHarnessThread *e_thread = gst_harness_stress_push_event_with_cb_start (h,
create_new_stream_start_event, &counter, NULL);
GstHarnessThread *q_thread = gst_harness_stress_custom_start (h, NULL,
push_query, h, 0);
gdouble duration = 1.0;
GTimer * timer = g_timer_new ();
while (g_timer_elapsed (timer, NULL) < duration) {
gst_harness_add_sink (h, "fakesink");
g_thread_yield ();
}
g_timer_destroy (timer);
gst_harness_stress_thread_stop (q_thread);
gst_harness_stress_thread_stop (e_thread);
gst_harness_teardown (h);
}
GST_END_TEST;
static Suite *
gst_harness_suite (void)
{
@ -130,6 +175,8 @@ gst_harness_suite (void)
tcase_add_test (tc_chain, test_src_harness_no_forwarding);
tcase_add_test (tc_chain, test_add_sink_harness_without_sinkpad);
tcase_add_test (tc_chain, test_forward_event_and_query_to_sink_harness_while_teardown);
return s;
}