mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

harness: Fix race for gst_harness_element_ref

Browse source 
In order for gst_harness_new_full to be MT-safe the increase and
decrease of HARNESS_REF must be MT-safe. This allows for creating
multiple harnesses from different threads wrapping the same element.

https://bugzilla.gnome.org/show_bug.cgi?id=754661
This commit is contained in:
Stian Selnes 2015-08-05 10:07:50 +02:00 committed by Tim-Philipp Müller
parent 615e5b01c6
commit ff9a78196c
2 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -433,7 +433,10 @@ gst_harness_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
static void static void
gst_harness_element_ref (GstHarness * h) gst_harness_element_ref (GstHarness * h)
{ {
guint *data = g_object_get_data (G_OBJECT (h->element), HARNESS_REF); guint *data;
GST_OBJECT_LOCK (h->element);
data = g_object_get_data (G_OBJECT (h->element), HARNESS_REF);
if (data == NULL) { if (data == NULL) {
data = g_new0 (guint, 1); data = g_new0 (guint, 1);
*data = 1; *data = 1;
@ -441,15 +444,23 @@ gst_harness_element_ref (GstHarness * h)
} else { } else {
(*data)++; (*data)++;
} }
GST_OBJECT_UNLOCK (h->element);
} }
static guint static guint
gst_harness_element_unref (GstHarness * h) gst_harness_element_unref (GstHarness * h)
{ {
guint *data = g_object_get_data (G_OBJECT (h->element), HARNESS_REF); guint *data;
guint ret;
GST_OBJECT_LOCK (h->element);
data = g_object_get_data (G_OBJECT (h->element), HARNESS_REF);
g_assert (data != NULL); g_assert (data != NULL);
(*data)--; (*data)--;
return *data; ret = *data;
GST_OBJECT_UNLOCK (h->element);
return ret;
} }
static void static void

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

@ -22,6 +22,33 @@
#include <gst/check/gstcheck.h> #include <gst/check/gstcheck.h>
#include <gst/check/gstharness.h> #include <gst/check/gstharness.h>
static void
create_destroy_element_harness (gpointer data, gpointer user_data)
{
GstElement * element = user_data;
GstHarness * h = gst_harness_new_with_element (element, NULL, NULL);
gst_harness_teardown (h);
}
GST_START_TEST(test_harness_element_ref)
{
GstHarness * h = gst_harness_new ("identity");
GstHarnessThread * threads[100];
gint i;
for (i = 0; i < G_N_ELEMENTS (threads); i++)
threads[i] = gst_harness_stress_custom_start (h, NULL,
create_destroy_element_harness, h->element, 0);
for (i = 0; i < G_N_ELEMENTS (threads); i++)
gst_harness_stress_thread_stop (threads[i]);
fail_unless_equals_int (G_OBJECT (h->element)->ref_count, 1);
gst_harness_teardown (h);
}
GST_END_TEST;
GST_START_TEST(test_src_harness) GST_START_TEST(test_src_harness)
{ {
GstHarness * h = gst_harness_new ("identity"); GstHarness * h = gst_harness_new ("identity");
@ -88,6 +115,7 @@ gst_harness_suite (void)
suite_add_tcase (s, tc_chain); suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_harness_element_ref);
tcase_add_test (tc_chain, test_src_harness); tcase_add_test (tc_chain, test_src_harness);
tcase_add_test (tc_chain, test_src_harness_no_forwarding); tcase_add_test (tc_chain, test_src_harness_no_forwarding);