From 7011f98d7e9415fc9265654431f2d74051ff138f Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Wed, 15 Jan 2014 11:26:33 +0100 Subject: [PATCH] tests: rtprtx::test_push_forward_seq: fix race condition Now with rtprtxsend pushing rtx buffers from a different thread, this is necessary to ensure that the result of the test is deterministic. This code makes use of GstCheck's global GMutex and GCond that are being used inside GstCheck's sink pad chain() function in order to synchronize with it. --- tests/check/elements/rtprtx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/check/elements/rtprtx.c b/tests/check/elements/rtprtx.c index bf4ded1171..c88e2af8dd 100644 --- a/tests/check/elements/rtprtx.c +++ b/tests/check/elements/rtprtx.c @@ -212,6 +212,9 @@ GST_START_TEST (test_push_forward_seq) GstEvent *event = NULL; GstRTPBuffer rtp = GST_RTP_BUFFER_INIT; GstBuffer *buffer = (GstBuffer *) node->data; + GList *last_out_buffer; + guint64 end_time; + gboolean res; gst_buffer_ref (buffer); fail_unless_equals_int (gst_pad_push (srcpad, buffer), GST_FLOW_OK); @@ -226,7 +229,17 @@ GST_START_TEST (test_push_forward_seq) (guint) gst_rtp_buffer_get_payload_type (&rtp), NULL)); gst_rtp_buffer_unmap (&rtp); + /* synchronize with the chain() function of the "sinkpad" + * to make sure that rtxsend has pushed the rtx buffer out + * before continuing */ + last_out_buffer = g_list_last (buffers); + g_mutex_lock (&check_mutex); fail_unless (gst_pad_push_event (sinkpad, event)); + end_time = g_get_monotonic_time () + G_TIME_SPAN_SECOND; + do + res = g_cond_wait_until (&check_cond, &check_mutex, end_time); + while (res == TRUE && last_out_buffer == g_list_last (buffers)); + g_mutex_unlock (&check_mutex); } gst_buffer_unref (buffer); ++i;