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

Merge branch 'gclosure-atomic-oops' into 'main'

Browse Source 
gclosure: fix ATOMIC_CHANGE_FIELD to read vint atomically

See merge request GNOME/glib!4575
This commit is contained in:
Philip Withnall 2025-04-03 22:38:46 +00:00
commit 148c1ed891
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/gclosure.c
View File

@ -110,15 +110,17 @@ typedef union {
G_STMT_START { \ G_STMT_START { \
ClosureInt *cunion = (ClosureInt*) _closure; \ ClosureInt *cunion = (ClosureInt*) _closure; \
gint new_int, old_int, success; \ gint new_int, old_int, success; \
old_int = g_atomic_int_get (&cunion->vint); \
do \ do \
{ \ { \
ClosureInt tmp; \ ClosureInt tmp; \
tmp.vint = old_int = cunion->vint; \ tmp.vint = old_int; \
_SET_OLD tmp.closure._field; \ _SET_OLD tmp.closure._field; \
tmp.closure._field _OP _value; \ tmp.closure._field _OP _value; \
_SET_NEW tmp.closure._field; \ _SET_NEW tmp.closure._field; \
new_int = tmp.vint; \ new_int = tmp.vint; \
success = g_atomic_int_compare_and_exchange (&cunion->vint, old_int, new_int); \ success = g_atomic_int_compare_and_exchange_full (&cunion->vint, old_int, new_int,\
&old_int); \
} \ } \
while (!success && _must_set); \ while (!success && _must_set); \
} G_STMT_END } G_STMT_END