mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
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 <adhemerval.zanella@linaro.org>
This commit is contained in:
@ -19,10 +19,11 @@
|
||||
#include <time.h>
|
||||
#include <elision-conf.h>
|
||||
#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"
|
||||
|
@ -24,7 +24,7 @@
|
||||
/* Transactional lock elision definitions. */
|
||||
extern int __lll_clocklock_elision
|
||||
(int *futex, short *adapt_count,
|
||||
clockid_t clockid, const struct timespec *timeout, int private)
|
||||
clockid_t clockid, const struct __timespec64 *timeout, int private)
|
||||
attribute_hidden;
|
||||
|
||||
#define lll_clocklock_elision(futex, adapt_count, clockid, timeout, private) \
|
||||
|
Reference in New Issue
Block a user