mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 13:56:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

identity: hack around g_object_notify() bug by protecting it with a lock

Browse source 
Out-of-band events might lead to us calling g_object_notify() from a
non-streaming thread, which can cause crashes if g_object_notify() is
being called from the streaming thread at the same time. See #554460.
This commit is contained in:
Tim-Philipp Müller 2009-05-31 21:27:40 +01:00
parent 249b9b9aa4
commit d9df74ea3e
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/elements/gstidentity.c
View file

@ -137,6 +137,7 @@ gst_identity_finalize (GObject * object)
identity = GST_IDENTITY (object); identity = GST_IDENTITY (object);
g_free (identity->last_message); g_free (identity->last_message);
g_static_rec_mutex_free (&identity->notify_lock);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -289,6 +290,21 @@ gst_identity_init (GstIdentity * identity, GstIdentityClass * g_class)
identity->dump = DEFAULT_DUMP; identity->dump = DEFAULT_DUMP;
identity->last_message = NULL; identity->last_message = NULL;
identity->signal_handoffs = DEFAULT_SIGNAL_HANDOFFS; identity->signal_handoffs = DEFAULT_SIGNAL_HANDOFFS;
g_static_rec_mutex_init (&identity->notify_lock);
}
static void
gst_identity_notify_last_message (GstIdentity * identity)
{
/* FIXME: this hacks around a bug in GLib/GObject: doing concurrent
* g_object_notify() on the same object might lead to crashes, see
* http://bugzilla.gnome.org/show_bug.cgi?id=166020#c60 and follow-ups.
* So we really don't want to do a g_object_notify() here for out-of-band
* events with the streaming thread possibly also doing a g_object_notify()
* for an in-band buffer or event. */
g_static_rec_mutex_lock (&identity->notify_lock);
g_object_notify ((GObject *) identity, "last_message");
g_static_rec_mutex_unlock (&identity->notify_lock);
} }
static gboolean static gboolean
@ -318,7 +334,7 @@ gst_identity_event (GstBaseTransform * trans, GstEvent * event)
g_free (sstr); g_free (sstr);
GST_OBJECT_UNLOCK (identity); GST_OBJECT_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last_message"); gst_identity_notify_last_message (identity);
} }
if (identity->single_segment if (identity->single_segment
@ -561,7 +577,7 @@ gst_identity_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), GST_BUFFER_OFFSET (buf), GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), GST_BUFFER_OFFSET (buf),
GST_BUFFER_OFFSET_END (buf), GST_BUFFER_FLAGS (buf), buf); GST_BUFFER_OFFSET_END (buf), GST_BUFFER_FLAGS (buf), buf);
GST_OBJECT_UNLOCK (identity); GST_OBJECT_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last-message"); gst_identity_notify_last_message (identity);
} }
/* return DROPPED to basetransform. */ /* return DROPPED to basetransform. */
return GST_BASE_TRANSFORM_FLOW_DROPPED; return GST_BASE_TRANSFORM_FLOW_DROPPED;
@ -585,7 +601,7 @@ gst_identity_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET_END (buf), GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET_END (buf),
GST_BUFFER_FLAGS (buf), buf); GST_BUFFER_FLAGS (buf), buf);
GST_OBJECT_UNLOCK (identity); GST_OBJECT_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last-message"); gst_identity_notify_last_message (identity);
} }
if (identity->datarate > 0) { if (identity->datarate > 0) {

1
plugins/elements/gstidentity.h
View file

@ -73,6 +73,7 @@ struct _GstIdentity {
gchar *last_message; gchar *last_message;
guint64 offset; guint64 offset;
gboolean signal_handoffs; gboolean signal_handoffs;
GStaticRecMutex notify_lock;
}; };
struct _GstIdentityClass { struct _GstIdentityClass {