diff options
| author | Thibault Saunier <tsaunier@gnome.org> | 2014-12-12 11:21:27 +0100 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@gnome.org> | 2014-12-12 11:49:42 +0100 |
| commit | b3c4b8d1dfa59d2318ff834a111f7f0854f56e87 (patch) | |
| tree | f622c814d4b30990b8145412eeda567f4a0633ff | |
| parent | aa25d0ab4c951d4411c711ce5f422a460eb0b55d (diff) | |
| download | gstreamer-plugins-bad-b3c4b8d1dfa59d2318ff834a111f7f0854f56e87.tar.gz | |
watchdog: GstElement->state is protected with the OBJECT_LOCK
Not the STATE_LOCK.
gst_watchdog_feed was already always called with the OBJECT_LOCK taken.
| -rw-r--r-- | gst/debugutils/gstwatchdog.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gst/debugutils/gstwatchdog.c b/gst/debugutils/gstwatchdog.c index fe48448ad..3292b4361 100644 --- a/gst/debugutils/gstwatchdog.c +++ b/gst/debugutils/gstwatchdog.c @@ -207,6 +207,7 @@ gst_watchdog_quit_mainloop (gpointer ptr) return FALSE; } +/* Call with OBJECT_LOCK taken */ static void gst_watchdog_feed (GstWatchdog * watchdog, gpointer mini_object, gboolean force) { @@ -243,8 +244,6 @@ gst_watchdog_feed (GstWatchdog * watchdog, gpointer mini_object, gboolean force) } - GST_STATE_LOCK (watchdog); - if (watchdog->timeout == 0) { GST_LOG_OBJECT (watchdog, "Timeout is 0 => nothing to do"); } else if (watchdog->main_context == NULL) { @@ -258,7 +257,6 @@ gst_watchdog_feed (GstWatchdog * watchdog, gpointer mini_object, gboolean force) gst_object_ref (watchdog), gst_object_unref); g_source_attach (watchdog->source, watchdog->main_context); } - GST_STATE_UNLOCK (watchdog); } static gboolean |