1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00

y2038: Convert aio_suspend to support 64 bit time

The aio_suspend function has been converted to support 64 bit time.

This change uses (in aio_misc.h):
- __futex_abstimed_wait64 (instead of futex_reltimed_wait)
- __futex_abstimed_wait_cancellable64
	(instead of futex_reltimed_wait_cancellable)
    from ./sysdeps/nptl/futex-helpers.h

The aio_suspend() accepts relative timeout, which then is converted to
absolute one.

The i686-gnu port (HURD) do not define DONT_NEED_AIO_MISC_COND and as it
doesn't (yet) support 64 bit time it uses not converted
pthread_cond_timedwait().

The __aio_suspend() is supposed to be run on ports with __TIMESIZE !=64 and
__WORDSIZE==32. It internally utilizes __aio_suspend_time64() and hence the
conversion from 32 bit struct timespec to 64 bit one is required.

For ports supporting 64 bit time the __aio_suspend_time64() will be used
either via alias (to __aio_suspend when __TIMESIZE==64) or redirection
(when -D_TIME_BITS=64 is passed).

Build tests:
./src/scripts/build-many-glibcs.py glibcs

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Lukasz Majewski
2020-11-23 17:47:20 -03:00
parent fdb724f903
commit cc5d5852c6
6 changed files with 57 additions and 31 deletions

View File

@ -45,11 +45,12 @@
do \
{ \
if (cancel) \
status = futex_reltimed_wait_cancelable ( \
(unsigned int *) futexaddr, oldval, timeout, FUTEX_PRIVATE); \
status = __futex_abstimed_wait_cancelable64 ( \
(unsigned int *) futexaddr, oldval, CLOCK_MONOTONIC, timeout, \
FUTEX_PRIVATE); \
else \
status = futex_reltimed_wait ((unsigned int *) futexaddr, \
oldval, timeout, FUTEX_PRIVATE); \
status = __futex_abstimed_wait64 ((unsigned int *) futexaddr, \
oldval, CLOCK_REALTIME, timeout, FUTEX_PRIVATE); \
if (status != EAGAIN) \
break; \
\
@ -61,6 +62,8 @@
result = EINTR; \
else if (status == ETIMEDOUT) \
result = EAGAIN; \
else if (status == EOVERFLOW) \
result = EOVERFLOW; \
else \
assert (status == 0 || status == EAGAIN); \
\