luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

notify: Make GObject property change notifications thread safe

Browse Source 
Adds locking around object property change notification handling. The
notifications are only emitted after all threads have called
g_object_thaw_notify().

https://bugzilla.gnome.org/show_bug.cgi?id=166020
This commit is contained in:
Olivier Crête 2010-07-22 21:26:32 +02:00 committed by Benjamin Otte
parent 65797f7e54
commit 9026b11e38
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gobject/gobjectnotifyqueue.c
View File

@ -50,6 +50,8 @@ struct _GObjectNotifyQueue
guint16 freeze_count; guint16 freeze_count;
}; };
G_LOCK_DEFINE_STATIC(notify_lock);
/* --- functions --- */ /* --- functions --- */
static void static void
g_object_notify_queue_free (gpointer data) g_object_notify_queue_free (gpointer data)
@ -66,6 +68,7 @@ g_object_notify_queue_freeze (GObject *object,
{ {
GObjectNotifyQueue *nqueue; GObjectNotifyQueue *nqueue;
G_LOCK(notify_lock);
nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue); nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
if (!nqueue) if (!nqueue)
{ {
@ -82,6 +85,7 @@ g_object_notify_queue_freeze (GObject *object,
G_OBJECT_TYPE_NAME (object), object); G_OBJECT_TYPE_NAME (object), object);
else else
nqueue->freeze_count++; nqueue->freeze_count++;
G_UNLOCK(notify_lock);
return nqueue; return nqueue;
} }
@ -98,8 +102,11 @@ g_object_notify_queue_thaw (GObject *object,
g_return_if_fail (nqueue->freeze_count > 0); g_return_if_fail (nqueue->freeze_count > 0);
g_return_if_fail (g_atomic_int_get(&object->ref_count) > 0); g_return_if_fail (g_atomic_int_get(&object->ref_count) > 0);
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_warning ("%s: property-changed notification for %s(%p) is not frozen",
G_STRFUNC, G_OBJECT_TYPE_NAME (object), object); G_STRFUNC, G_OBJECT_TYPE_NAME (object), object);
return; return;
@ -107,6 +114,7 @@ g_object_notify_queue_thaw (GObject *object,
nqueue->freeze_count--; nqueue->freeze_count--;
if (nqueue->freeze_count) { if (nqueue->freeze_count) {
G_UNLOCK(notify_lock);
return; return;
} }
@ -129,6 +137,8 @@ g_object_notify_queue_thaw (GObject *object,
} }
g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL); g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
G_UNLOCK(notify_lock);
if (n_pspecs) if (n_pspecs)
context->dispatcher (object, n_pspecs, pspecs); context->dispatcher (object, n_pspecs, pspecs);
g_free (free_me); g_free (free_me);
@ -143,6 +153,8 @@ g_object_notify_queue_add (GObject *object,
{ {
GParamSpec *redirect; GParamSpec *redirect;
G_LOCK(notify_lock);
g_return_if_fail (nqueue->n_pspecs < 65535); g_return_if_fail (nqueue->n_pspecs < 65535);
redirect = g_param_spec_get_redirect_target (pspec); redirect = g_param_spec_get_redirect_target (pspec);
@ -152,6 +164,8 @@ g_object_notify_queue_add (GObject *object,
/* we do the deduping in _thaw */ /* we do the deduping in _thaw */
nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec); nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
nqueue->n_pspecs++; nqueue->n_pspecs++;
G_UNLOCK(notify_lock);
} }
} }