mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 11:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

miniobject: make refcount tracing and debug logging reliable

Browse source 
Tracing of the refcounts wasn't thread-safe, and log output of
the refcount values before/after wasn't reliable.

https://bugzilla.gnome.org/show_bug.cgi?id=784383
This commit is contained in:
Tim-Philipp Müller 2017-07-03 09:03:24 +01:00
parent f29082bfe1
commit cce18426f7
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst/gstminiobject.c
View file

@ -338,6 +338,8 @@ gst_mini_object_make_writable (GstMiniObject * mini_object)
GstMiniObject * GstMiniObject *
gst_mini_object_ref (GstMiniObject * mini_object) gst_mini_object_ref (GstMiniObject * mini_object)
{ {
gint old_refcount, new_refcount;
g_return_val_if_fail (mini_object != NULL, NULL); g_return_val_if_fail (mini_object != NULL, NULL);
/* we can't assert that the refcount > 0 since the _free functions /* we can't assert that the refcount > 0 since the _free functions
* increments the refcount from 0 to 1 again to allow resurecting * increments the refcount from 0 to 1 again to allow resurecting
@ -345,12 +347,13 @@ gst_mini_object_ref (GstMiniObject * mini_object)
g_return_val_if_fail (mini_object->refcount > 0, NULL); g_return_val_if_fail (mini_object->refcount > 0, NULL);
*/ */
GST_TRACER_MINI_OBJECT_REFFED (mini_object, mini_object->refcount + 1); old_refcount = g_atomic_int_add (&mini_object->refcount, 1);
GST_CAT_TRACE (GST_CAT_REFCOUNTING, "%p ref %d->%d", mini_object, new_refcount = old_refcount + 1;
GST_MINI_OBJECT_REFCOUNT_VALUE (mini_object),
GST_MINI_OBJECT_REFCOUNT_VALUE (mini_object) + 1);
g_atomic_int_inc (&mini_object->refcount); GST_CAT_TRACE (GST_CAT_REFCOUNTING, "%p ref %d->%d", mini_object,
old_refcount, new_refcount);
GST_TRACER_MINI_OBJECT_REFFED (mini_object, new_refcount);
return mini_object; return mini_object;
} }
@ -423,19 +426,23 @@ call_finalize_notify (GstMiniObject * obj)
void void
gst_mini_object_unref (GstMiniObject * mini_object) gst_mini_object_unref (GstMiniObject * mini_object)
{ {
gint old_refcount, new_refcount;
g_return_if_fail (mini_object != NULL); g_return_if_fail (mini_object != NULL);
old_refcount = g_atomic_int_add (&mini_object->refcount, -1);
new_refcount = old_refcount - 1;
g_return_if_fail (old_refcount > 0);
GST_CAT_TRACE (GST_CAT_REFCOUNTING, "%p unref %d->%d", GST_CAT_TRACE (GST_CAT_REFCOUNTING, "%p unref %d->%d",
mini_object, mini_object, old_refcount, new_refcount);
GST_MINI_OBJECT_REFCOUNT_VALUE (mini_object),
GST_MINI_OBJECT_REFCOUNT_VALUE (mini_object) - 1);
g_return_if_fail (mini_object->refcount > 0); GST_TRACER_MINI_OBJECT_UNREFFED (mini_object, new_refcount);
if (G_UNLIKELY (g_atomic_int_dec_and_test (&mini_object->refcount))) { if (new_refcount == 0) {
gboolean do_free; gboolean do_free;
GST_TRACER_MINI_OBJECT_UNREFFED (mini_object, mini_object->refcount);
if (mini_object->dispose) if (mini_object->dispose)
do_free = mini_object->dispose (mini_object); do_free = mini_object->dispose (mini_object);
else else
@ -456,8 +463,6 @@ gst_mini_object_unref (GstMiniObject * mini_object)
if (mini_object->free) if (mini_object->free)
mini_object->free (mini_object); mini_object->free (mini_object);
} }
} else {
GST_TRACER_MINI_OBJECT_UNREFFED (mini_object, mini_object->refcount);
} }
} }