luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pkj/fix-g_futex_simple' into 'main'

Browse Source 
Avoid having g_futex_simple() inadvertently modify errno

See merge request GNOME/glib!3398
This commit is contained in:
Sebastian Dröge 2023-04-26 06:29:43 +00:00
commit 1df0e81b19
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gthreadprivate.h
View File

@ -65,9 +65,13 @@ struct _GRealThread
#define g_futex_simple(uaddr, futex_op, ...) \
G_STMT_START \
{ \
int saved_errno = errno; \
int res = syscall (__NR_futex_time64, uaddr, (gsize) futex_op, __VA_ARGS__); \
if (res < 0 && errno == ENOSYS) \
syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \
{ \
errno = saved_errno; \
syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \
} \
} \
G_STMT_END
#elif defined(__NR_futex_time64)