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/semaphoreP.h | |
parent | 13cd6258856da7d6645eefd0b640319d176473c8 (diff) | |
download | glibc-b8d3e8fbaac154979078e6665aa983742dec9539.tar glibc-b8d3e8fbaac154979078e6665aa983742dec9539.tar.gz glibc-b8d3e8fbaac154979078e6665aa983742dec9539.tar.bz2 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/semaphoreP.h')
-rw-r--r-- | nptl/semaphoreP.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/nptl/semaphoreP.h b/nptl/semaphoreP.h index e7e1c9763f..f25ba329d7 100644 --- a/nptl/semaphoreP.h +++ b/nptl/semaphoreP.h @@ -52,3 +52,16 @@ extern int __new_sem_wait (sem_t *sem); extern int __old_sem_wait (sem_t *sem); extern int __new_sem_trywait (sem_t *sem); extern int __new_sem_getvalue (sem_t *sem, int *sval); + +#if __TIMESIZE == 64 +# define __sem_clockwait64 __sem_clockwait +# define __sem_timedwait64 __sem_timedwait +#else +extern int +__sem_clockwait64 (sem_t *sem, clockid_t clockid, + const struct __timespec64 *abstime); +libpthread_hidden_proto (__sem_clockwait64) +extern int +__sem_timedwait64 (sem_t *sem, const struct __timespec64 *abstime); +libpthread_hidden_proto (__sem_timedwait64) +#endif |