luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 02:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gobject-speedup3' into 'main'

Browse Source 
Simplify g_object_notify_by_pspec

See merge request GNOME/glib!2714
This commit is contained in:
Philip Withnall 2022-06-06 13:02:52 +00:00
commit 22fea9d24a
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gobject/gobject.c
View File

@ -1315,33 +1315,20 @@ g_object_freeze_notify (GObject *object)
g_object_unref (object); g_object_unref (object);
} }
static GParamSpec * static inline void
get_notify_pspec (GParamSpec *pspec) g_object_notify_by_spec_internal (GObject *object,
GParamSpec *pspec)
{ {
GParamSpec *redirected; GParamSpec *redirected;
/* we don't notify on non-READABLE parameters */ if (G_UNLIKELY (~pspec->flags & G_PARAM_READABLE))
if (~pspec->flags & G_PARAM_READABLE) return;
return NULL;
/* if the paramspec is redirected, notify on the target */
redirected = g_param_spec_get_redirect_target (pspec); redirected = g_param_spec_get_redirect_target (pspec);
if (redirected != NULL) if (redirected != NULL)
return redirected; pspec = redirected;
/* else, notify normally */ if (pspec != NULL)
return pspec;
}
static inline void
g_object_notify_by_spec_internal (GObject *object,
GParamSpec *pspec)
{
GParamSpec *notify_pspec;
notify_pspec = get_notify_pspec (pspec);
if (notify_pspec != NULL)
{ {
GObjectNotifyQueue *nqueue; GObjectNotifyQueue *nqueue;
@ -1351,13 +1338,13 @@ g_object_notify_by_spec_internal (GObject *object,
if (nqueue != NULL) if (nqueue != NULL)
{ {
/* we're frozen, so add to the queue and release our freeze */ /* we're frozen, so add to the queue and release our freeze */
g_object_notify_queue_add (object, nqueue, notify_pspec); g_object_notify_queue_add (object, nqueue, pspec);
g_object_notify_queue_thaw (object, nqueue); g_object_notify_queue_thaw (object, nqueue);
} }
else else
/* not frozen, so just dispatch the notification directly */ /* not frozen, so just dispatch the notification directly */
G_OBJECT_GET_CLASS (object) G_OBJECT_GET_CLASS (object)
->dispatch_properties_changed (object, 1, &notify_pspec); ->dispatch_properties_changed (object, 1, &pspec);
} }
} }