luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gobject-speedup10' into 'main'

Browse Source 
gobject: Avoid redundant atomics

See merge request GNOME/glib!2724
This commit is contained in:
Philip Withnall 2022-06-07 11:46:23 +00:00
commit 3076c60e9c
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gobject/gobject.c
View File

@ -319,23 +319,23 @@ g_object_notify_queue_thaw (GObject *object,
GSList *slist; GSList *slist;
guint n_pspecs = 0; guint n_pspecs = 0;
g_return_if_fail (g_atomic_int_get(&object->ref_count) > 0);
G_LOCK(notify_lock); G_LOCK(notify_lock);
/* Just make sure we never get into some nasty race condition */ /* Just make sure we never get into some nasty race condition */
if (G_UNLIKELY(nqueue->freeze_count == 0)) { if (G_UNLIKELY (nqueue->freeze_count == 0))
G_UNLOCK(notify_lock); {
g_warning ("%s: property-changed notification for %s(%p) is not frozen", G_UNLOCK (notify_lock);
G_STRFUNC, G_OBJECT_TYPE_NAME (object), object); g_warning ("%s: property-changed notification for %s(%p) is not frozen",
return; G_STRFUNC, G_OBJECT_TYPE_NAME (object), object);
} return;
}
nqueue->freeze_count--; nqueue->freeze_count--;
if (nqueue->freeze_count) { if (nqueue->freeze_count)
G_UNLOCK(notify_lock); {
return; G_UNLOCK (notify_lock);
} return;
}
pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem; pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem;
@ -1394,8 +1394,6 @@ g_object_notify (GObject *object,
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (property_name != NULL); g_return_if_fail (property_name != NULL);
if (g_atomic_int_get (&object->ref_count) == 0)
return;
/* We don't need to get the redirect target /* We don't need to get the redirect target
* (by, e.g. calling g_object_class_find_property()) * (by, e.g. calling g_object_class_find_property())
@ -1468,9 +1466,6 @@ g_object_notify_by_pspec (GObject *object,
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (G_IS_PARAM_SPEC (pspec)); g_return_if_fail (G_IS_PARAM_SPEC (pspec));
if (g_atomic_int_get (&object->ref_count) == 0)
return;
g_object_notify_by_spec_internal (object, pspec); g_object_notify_by_spec_internal (object, pspec);
} }