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

gobject: avoid additional freeze+thaw in g_object_thaw_notify()

Browse Source 
It's easy to avoid.
This commit is contained in:
Thomas Haller 2023-12-14 11:09:01 +01:00
parent f2fafdfe06
commit 95c2150d61
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gobject/gobject.c
View File

@ -257,8 +257,14 @@ g_object_notify_queue_thaw (GObject *object,
G_LOCK(notify_lock); G_LOCK(notify_lock);
if (!nqueue)
{
/* Caller didn't look up the queue yet. Do it now. */
nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
}
/* 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 || nqueue->freeze_count == 0))
{ {
G_UNLOCK (notify_lock); G_UNLOCK (notify_lock);
g_critical ("%s: property-changed notification for %s(%p) is not frozen", g_critical ("%s: property-changed notification for %s(%p) is not frozen",
@ -1636,8 +1642,6 @@ g_object_notify_by_pspec (GObject *object,
void void
g_object_thaw_notify (GObject *object) g_object_thaw_notify (GObject *object)
{ {
GObjectNotifyQueue *nqueue;
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
#ifndef G_DISABLE_CHECKS #ifndef G_DISABLE_CHECKS
@ -1651,15 +1655,9 @@ g_object_thaw_notify (GObject *object)
} }
#endif #endif
g_object_ref (object); g_object_ref (object);
/* FIXME: Freezing is the only way to get at the notify queue. g_object_notify_queue_thaw (object, NULL);
* So we freeze once and then thaw twice.
*/
nqueue = g_object_notify_queue_freeze (object, FALSE);
g_object_notify_queue_thaw (object, nqueue);
g_object_notify_queue_thaw (object, nqueue);
g_object_unref (object); g_object_unref (object);
} }