luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-13 09:23:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdataset: use g_datalist_unlock_and_set() in gdataset

Browse Source 
This saves an additional atomic set.

Also, changing the pointer before the unlock can awake a blocked thread,
but at this point, the lock is still held (and the thread may need to
sleep again). This can be avoided.
This commit is contained in:
Thomas Haller 2024-01-04 17:22:42 +01:00
parent c4c76d77cb
commit 8439b589ec
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
glib/gdataset.c
View File

@ -146,6 +146,12 @@ g_datalist_unlock (GData **datalist)
g_pointer_bit_unlock ((void **)datalist, DATALIST_LOCK_BIT); g_pointer_bit_unlock ((void **)datalist, DATALIST_LOCK_BIT);
} }
static void
g_datalist_unlock_and_set (GData **datalist, gpointer ptr)
{
g_pointer_bit_unlock_and_set ((void **) datalist, DATALIST_LOCK_BIT, ptr, G_DATALIST_FLAGS_MASK_INTERNAL);
}
/* Called with the datalist lock held, or the dataset global /* Called with the datalist lock held, or the dataset global
* lock for dataset lists * lock for dataset lists
*/ */
@ -192,9 +198,8 @@ g_datalist_clear (GData **datalist)
g_datalist_lock (datalist); g_datalist_lock (datalist);
data = G_DATALIST_GET_POINTER (datalist); data = G_DATALIST_GET_POINTER (datalist);
G_DATALIST_SET_POINTER (datalist, NULL);
g_datalist_unlock (datalist); g_datalist_unlock_and_set (datalist, NULL);
if (data) if (data)
{ {
@ -280,6 +285,7 @@ g_data_set_internal (GData **datalist,
GDataset *dataset) GDataset *dataset)
{ {
GData *d, *old_d; GData *d, *old_d;
GData *new_d = NULL;
GDataElt old, *data, *data_last, *data_end; GDataElt old, *data, *data_last, *data_end;
g_datalist_lock (datalist); g_datalist_lock (datalist);
@ -306,12 +312,12 @@ g_data_set_internal (GData **datalist,
*/ */
if (d->len == 0) if (d->len == 0)
{ {
G_DATALIST_SET_POINTER (datalist, NULL);
g_free (d);
/* datalist may be situated in dataset, so must not be /* datalist may be situated in dataset, so must not be
* unlocked after we free it * unlocked when we free it
*/ */
g_datalist_unlock (datalist); g_datalist_unlock_and_set (datalist, NULL);
g_free (d);
/* the dataset destruction *must* be done /* the dataset destruction *must* be done
* prior to invocation of the data destroy function * prior to invocation of the data destroy function
@ -402,7 +408,7 @@ g_data_set_internal (GData **datalist,
d = g_realloc (d, sizeof (GData) + (d->alloc - 1) * sizeof (GDataElt)); d = g_realloc (d, sizeof (GData) + (d->alloc - 1) * sizeof (GDataElt));
} }
if (old_d != d) if (old_d != d)
G_DATALIST_SET_POINTER (datalist, d); new_d = d;
d->data[d->len].key = key_id; d->data[d->len].key = key_id;
d->data[d->len].data = new_data; d->data[d->len].data = new_data;
@ -410,6 +416,9 @@ g_data_set_internal (GData **datalist,
d->len++; d->len++;
} }
if (new_d)
g_datalist_unlock_and_set (datalist, new_d);
else
g_datalist_unlock (datalist); g_datalist_unlock (datalist);
return NULL; return NULL;
@ -964,6 +973,7 @@ g_datalist_id_replace_data (GData **datalist,
{ {
gpointer val = NULL; gpointer val = NULL;
GData *d; GData *d;
GData *new_d = NULL;
GDataElt *data, *data_end; GDataElt *data, *data_end;
g_return_val_if_fail (datalist != NULL, FALSE); g_return_val_if_fail (datalist != NULL, FALSE);
@ -1033,7 +1043,7 @@ g_datalist_id_replace_data (GData **datalist,
d = g_realloc (d, sizeof (GData) + (d->alloc - 1) * sizeof (GDataElt)); d = g_realloc (d, sizeof (GData) + (d->alloc - 1) * sizeof (GDataElt));
} }
if (old_d != d) if (old_d != d)
G_DATALIST_SET_POINTER (datalist, d); new_d = d;
d->data[d->len].key = key_id; d->data[d->len].key = key_id;
d->data[d->len].data = newval; d->data[d->len].data = newval;
@ -1041,6 +1051,9 @@ g_datalist_id_replace_data (GData **datalist,
d->len++; d->len++;
} }
if (new_d)
g_datalist_unlock_and_set (datalist, new_d);
else
g_datalist_unlock (datalist); g_datalist_unlock (datalist);
return val == oldval; return val == oldval;