mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-16 04:54:12 +00:00
Code Issues1 Projects Releases Wiki Activity

watchdog: race between g_main_loop_run/_quit fixed

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=697694
This commit is contained in:
Alexander Schrab 2013-04-10 11:06:52 +02:00 committed by Tim-Philipp Müller
parent 4a9c3d4f16
commit 3320f29a88
1 changed files with 22 additions and 1 deletions

23
gst/debugutils/gstwatchdog.c
View file

@ -228,6 +228,18 @@ gst_watchdog_trigger (gpointer ptr)
return FALSE;
}
static gboolean
gst_watchdog_quit_mainloop (gpointer ptr)
{
GstWatchdog *watchdog = GST_WATCHDOG (ptr);
GST_DEBUG_OBJECT (watchdog, "watchdog quit");
g_main_loop_quit (watchdog->main_loop);
return FALSE;
}
static void
gst_watchdog_feed (GstWatchdog * watchdog)
{
@ -260,6 +272,7 @@ static gboolean
gst_watchdog_stop (GstBaseTransform * trans)
{
GstWatchdog *watchdog = GST_WATCHDOG (trans);
GSource *quit_source;
GST_DEBUG_OBJECT (watchdog, "stop");
@ -268,7 +281,15 @@ gst_watchdog_stop (GstBaseTransform * trans)
g_source_unref (watchdog->source);
watchdog->source = NULL;
}
g_main_loop_quit (watchdog->main_loop);
/* dispatch an idle event that trigger g_main_loop_quit to avoid race
* between g_main_loop_run and g_main_loop_quit */
quit_source = g_idle_source_new ();
g_source_set_callback (quit_source, gst_watchdog_quit_mainloop, watchdog,
NULL);
g_source_attach (quit_source, watchdog->main_context);
g_source_unref (quit_source);
g_thread_join (watchdog->thread);
g_main_loop_unref (watchdog->main_loop);
g_main_context_unref (watchdog->main_context);