diff options
author | Lukasz Majewski <lukma@denx.de> | 2020-09-07 10:22:21 +0200 |
---|---|---|
committer | Lukasz Majewski <lukma@denx.de> | 2020-09-14 09:37:10 +0200 |
commit | b8d3e8fbaac154979078e6665aa983742dec9539 (patch) | |
tree | d8887dd5b716e35074dc241e647e550ba9a3ad45 /nptl/sem_wait.c | |
parent | 13cd6258856da7d6645eefd0b640319d176473c8 (diff) | |
download | glibc-b8d3e8fbaac154979078e6665aa983742dec9539.tar.gz glibc-b8d3e8fbaac154979078e6665aa983742dec9539.tar.xz glibc-b8d3e8fbaac154979078e6665aa983742dec9539.zip |
y2038: nptl: Convert sem_{clock|timed}wait to support 64 bit time
The sem_clockwait and sem_timedwait have been converted to support 64 bit time. This change reuses futex_abstimed_wait_cancelable64 function introduced earlier. The sem_{clock|timed}wait only accepts absolute time. Moreover, there is no need to check for NULL passed as *abstime pointer to the syscalls as both calls have exported symbols marked with __nonull attribute for abstime. For systems with __TIMESIZE != 64 && __WORDSIZE == 32: - Conversion from 32 bit time to 64 bit struct __timespec64 was necessary - Redirection to __sem_{clock|timed}wait64 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 __sem_{clock|timed}wait64 and __sem_{clock|timed}wait. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/sem_wait.c')
-rw-r--r-- | nptl/sem_wait.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nptl/sem_wait.c b/nptl/sem_wait.c index 171716fdbc..9374e0aaf6 100644 --- a/nptl/sem_wait.c +++ b/nptl/sem_wait.c @@ -18,6 +18,7 @@ <https://www.gnu.org/licenses/>. */ #include <lowlevellock.h> /* lll_futex* used by the old code. */ +#include "semaphoreP.h" #include "sem_waitcommon.c" int @@ -39,8 +40,8 @@ __new_sem_wait (sem_t *sem) if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0) return 0; else - return __new_sem_wait_slow ((struct new_sem *) sem, - CLOCK_REALTIME, NULL); + return __new_sem_wait_slow64 ((struct new_sem *) sem, + CLOCK_REALTIME, NULL); } versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1); |