diff options
| -rw-r--r-- | nptl/Versions | 1 | ||||
| -rw-r--r-- | nptl/lowlevellock.c | 14 | ||||
| -rw-r--r-- | sysdeps/nptl/lowlevellock.h | 26 |
3 files changed, 33 insertions, 8 deletions
diff --git a/nptl/Versions b/nptl/Versions index 2a75f013f2..3221de89d1 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -380,6 +380,7 @@ libc { } GLIBC_PRIVATE { __libc_alloca_cutoff; + __lll_lock_wake_private; __lll_lock_wait_private; __nptl_create_event; __nptl_death_event; diff --git a/nptl/lowlevellock.c b/nptl/lowlevellock.c index 2d077d8694..4f88178964 100644 --- a/nptl/lowlevellock.c +++ b/nptl/lowlevellock.c @@ -52,6 +52,20 @@ __lll_lock_wait (int *futex, int private) } libc_hidden_def (__lll_lock_wait) +void +__lll_lock_wake_private (int *futex) +{ + lll_futex_wake (futex, 1, LLL_PRIVATE); +} +libc_hidden_def (__lll_lock_wake_private) + +void +__lll_lock_wake (int *futex, int private) +{ + lll_futex_wake (futex, 1, private); +} +libc_hidden_def (__lll_lock_wake) + #if ENABLE_ELISION_SUPPORT int __pthread_force_elision __attribute__ ((nocommon)); libc_hidden_data_def (__pthread_force_elision) diff --git a/sysdeps/nptl/lowlevellock.h b/sysdeps/nptl/lowlevellock.h index be60c9ac28..4d95114ed3 100644 --- a/sysdeps/nptl/lowlevellock.h +++ b/sysdeps/nptl/lowlevellock.h @@ -125,6 +125,11 @@ libc_hidden_proto (__lll_lock_wait) #define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private) +extern void __lll_lock_wake_private (int *futex); +libc_hidden_proto (__lll_lock_wake_private) +extern void __lll_lock_wake (int *futex, int private); +libc_hidden_proto (__lll_lock_wake) + /* This is an expression rather than a statement even though its value is void, so that it can be used in a comma expression or as an expression that's cast to void. */ @@ -137,14 +142,19 @@ libc_hidden_proto (__lll_lock_wait) acquires the lock and when there will be no further lock acquisitions; thus, we must not access the lock after releasing it, or those accesses could be concurrent with mutex destruction or reuse of the memory. */ -#define __lll_unlock(futex, private) \ - ((void) \ - ({ \ - int *__futex = (futex); \ - int __private = (private); \ - int __oldval = atomic_exchange_rel (__futex, 0); \ - if (__glibc_unlikely (__oldval > 1)) \ - lll_futex_wake (__futex, 1, __private); \ +#define __lll_unlock(futex, private) \ + ((void) \ + ({ \ + int *__futex = (futex); \ + int __private = (private); \ + int __oldval = atomic_exchange_rel (__futex, 0); \ + if (__glibc_unlikely (__oldval > 1)) \ + { \ + if (__builtin_constant_p (private) && (private) == LLL_PRIVATE) \ + __lll_lock_wake_private (__futex); \ + else \ + __lll_lock_wake (__futex, __private); \ + } \ })) #define lll_unlock(futex, private) \ __lll_unlock (&(futex), private) |