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

gobject: use per-object bit-lock instead of global mutex for closure array

Browse Source
This commit is contained in:
Thomas Haller
2023-12-20 09:55:32 +01:00
parent ab202a2c1c
commit b397ef2122
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gobject/gobject.c
View File

@@ -126,6 +126,7 @@ enum {
#define OPTIONAL_BIT_LOCK_WEAK_REFS 1 #define OPTIONAL_BIT_LOCK_WEAK_REFS 1
#define OPTIONAL_BIT_LOCK_NOTIFY 2 #define OPTIONAL_BIT_LOCK_NOTIFY 2
#define OPTIONAL_BIT_LOCK_TOGGLE_REFS 3 #define OPTIONAL_BIT_LOCK_TOGGLE_REFS 3
#define OPTIONAL_BIT_LOCK_CLOSURE_ARRAY 4
#if SIZEOF_INT == 4 && GLIB_SIZEOF_VOID_P == 8 #if SIZEOF_INT == 4 && GLIB_SIZEOF_VOID_P == 8
#define HAVE_OPTIONAL_FLAGS_IN_GOBJECT 1 #define HAVE_OPTIONAL_FLAGS_IN_GOBJECT 1
@@ -221,7 +222,6 @@ struct _GObjectNotifyQueue
}; };
/* --- variables --- */ /* --- variables --- */
G_LOCK_DEFINE_STATIC (closure_array_mutex);
static GQuark quark_closure_array = 0; static GQuark quark_closure_array = 0;
static GQuark quark_weak_notifies = 0; static GQuark quark_weak_notifies = 0;
static GQuark quark_toggle_refs = 0; static GQuark quark_toggle_refs = 0;
@@ -4805,7 +4805,7 @@ object_remove_closure (gpointer data,
CArray *carray; CArray *carray;
guint i; guint i;
G_LOCK (closure_array_mutex); object_bit_lock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
carray = g_object_get_qdata (object, quark_closure_array); carray = g_object_get_qdata (object, quark_closure_array);
for (i = 0; i < carray->n_closures; i++) for (i = 0; i < carray->n_closures; i++)
if (carray->closures[i] == closure) if (carray->closures[i] == closure)
@@ -4813,10 +4813,10 @@ object_remove_closure (gpointer data,
carray->n_closures--; carray->n_closures--;
if (i < carray->n_closures) if (i < carray->n_closures)
carray->closures[i] = carray->closures[carray->n_closures]; carray->closures[i] = carray->closures[carray->n_closures];
G_UNLOCK (closure_array_mutex); object_bit_unlock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
return; return;
} }
G_UNLOCK (closure_array_mutex); object_bit_unlock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
g_assert_not_reached (); g_assert_not_reached ();
} }
@@ -4872,7 +4872,7 @@ g_object_watch_closure (GObject *object,
g_closure_add_marshal_guards (closure, g_closure_add_marshal_guards (closure,
object, (GClosureNotify) g_object_ref, object, (GClosureNotify) g_object_ref,
object, (GClosureNotify) g_object_unref); object, (GClosureNotify) g_object_unref);
G_LOCK (closure_array_mutex); object_bit_lock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
carray = g_datalist_id_remove_no_notify (&object->qdata, quark_closure_array); carray = g_datalist_id_remove_no_notify (&object->qdata, quark_closure_array);
if (!carray) if (!carray)
{ {
@@ -4888,7 +4888,7 @@ g_object_watch_closure (GObject *object,
} }
carray->closures[i] = closure; carray->closures[i] = closure;
g_datalist_id_set_data_full (&object->qdata, quark_closure_array, carray, destroy_closure_array); g_datalist_id_set_data_full (&object->qdata, quark_closure_array, carray, destroy_closure_array);
G_UNLOCK (closure_array_mutex); object_bit_unlock (object, OPTIONAL_BIT_LOCK_CLOSURE_ARRAY);
} }
/** /**