From 29e9874a048f47e2d46c40253036c8d2de921548 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 18 Sep 2020 20:54:13 +0200 Subject: y2038: nptl: Convert pthread_mutex_{clock|timed}lock to support 64 bit The pthread_mutex_clocklock and pthread_mutex_timedlock have been converted to support 64 bit time. This change uses: - New __futex_clocklock_wait64 (instead of lll_timedwait) from ./sysdeps/nptl/futex-helpers.c and - New __futex_clocklock64 function (instead of lll_clocklock) - New futex_lock_pi64 defined in sysdeps/nptl/futex-internal.h The pthread_mutex_{clock|timed}lock only accepts absolute time. Moreover, there is no need to check for NULL passed as *abstime pointer to the syscalls as those calls have exported symbols marked with __nonull attribute for abstime. Some architectures - namely x86, powerpc and s390 - do support lock elision. For those - adjustments have been made in arch specific elision-*.c files to use __futex_clocklock64 instead of lll_clocklock. The __lll_lock_elision (aliased to __lll_clocklock_elision in e.g. sysdeps/unix/sysv/linux/s390/elision-timed.c) just uses, in this patch provided, __futex_clocklock64. For systems with __TIMESIZE != 64 && __WORDSIZE == 32: - Conversions between 64 bit time to 32 bit are necessary - Redirection to pthread_mutex_{clock|timed}lock will provide support for 64 bit time Build tests: ./src/scripts/build-many-glibcs.py glibcs Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/powerpc/elision-timed.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/powerpc/elision-timed.c') diff --git a/sysdeps/unix/sysv/linux/powerpc/elision-timed.c b/sysdeps/unix/sysv/linux/powerpc/elision-timed.c index 5c2b500f1d..45da7b03d1 100644 --- a/sysdeps/unix/sysv/linux/powerpc/elision-timed.c +++ b/sysdeps/unix/sysv/linux/powerpc/elision-timed.c @@ -19,10 +19,11 @@ #include #include #include "lowlevellock.h" +#include "futex-internal.h" #define __lll_lock_elision __lll_clocklock_elision -#define EXTRAARG clockid_t clockid, const struct timespec *t, +#define EXTRAARG clockid_t clockid, const struct __timespec64 *t, #undef LLL_LOCK -#define LLL_LOCK(a, b) lll_clocklock(a, clockid, t, b) +#define LLL_LOCK(a, b) __futex_clocklock64 (&(a), clockid, t, b) #include "elision-lock.c" -- cgit 1.4.1