diff options
author | Lukasz Majewski <lukma@denx.de> | 2020-09-08 11:51:23 +0200 |
---|---|---|
committer | Lukasz Majewski <lukma@denx.de> | 2020-10-04 17:13:46 +0200 |
commit | 3102e28bd11ed1083d3defdfd75e6d1273ab45f9 (patch) | |
tree | 2841a52e490edab8c36e5631301d61384ae2325c /nptl/pthread_rwlock_timedrdlock.c | |
parent | b2cdadde4d5c2b49b0f486a141ae0443ab8be375 (diff) | |
download | glibc-3102e28bd11ed1083d3defdfd75e6d1273ab45f9.tar.gz glibc-3102e28bd11ed1083d3defdfd75e6d1273ab45f9.tar.xz glibc-3102e28bd11ed1083d3defdfd75e6d1273ab45f9.zip |
y2038: nptl: Convert pthread_rwlock_{clock|timed}{rd|wr}lock to support 64 bit time
The pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_rwlock_timedrdlock and pthread_rwlock_timedwrlock have been converted to support 64 bit time. This change uses new futex_abstimed_wait64 function in ./sysdeps/nptl/futex-helpers.c, which uses futex_time64 where possible. The pthread_rwlock_{clock|timed}{rd|wr}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. For systems with __TIMESIZE != 64 && __WORDSIZE == 32: - Conversions between 64 bit time to 32 bit are necessary - Redirection to pthread_rwlock_{clock|timed}{rd|wr}lock will provide support for 64 bit time Build tests: ./src/scripts/build-many-glibcs.py glibcs Run-time tests: - Run specific tests on ARM/x86 32bit systems (qemu): https://github.com/lmajewski/meta-y2038 and run tests: https://github.com/lmajewski/y2038-tests/commits/master Above tests were performed with Y2038 redirection applied as well as without to test the proper usage of both __pthread_rwlock_{clock|timed}{rd|wr}lock64 and __pthread_rwlock_{clock|timed}{rd|wr}lock. Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'nptl/pthread_rwlock_timedrdlock.c')
-rw-r--r-- | nptl/pthread_rwlock_timedrdlock.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c index c5d8aee909..0bf4559a65 100644 --- a/nptl/pthread_rwlock_timedrdlock.c +++ b/nptl/pthread_rwlock_timedrdlock.c @@ -20,8 +20,22 @@ /* See pthread_rwlock_common.c. */ int -pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, - const struct timespec *abstime) +__pthread_rwlock_timedrdlock64 (pthread_rwlock_t *rwlock, + const struct __timespec64 *abstime) { - return __pthread_rwlock_rdlock_full (rwlock, CLOCK_REALTIME, abstime); + return __pthread_rwlock_rdlock_full64 (rwlock, CLOCK_REALTIME, abstime); } + +#if __TIMESIZE != 64 +libpthread_hidden_def (__pthread_rwlock_timedrdlock64) + +int +__pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, + const struct timespec *abstime) +{ + struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime); + + return __pthread_rwlock_timedrdlock64 (rwlock, &ts64); +} +#endif +weak_alias (__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock) |