diff options
Diffstat (limited to 'sysdeps/nptl')
-rw-r--r-- | sysdeps/nptl/aio_misc.h | 11 | ||||
-rw-r--r-- | sysdeps/nptl/futex-internal.c | 2 | ||||
-rw-r--r-- | sysdeps/nptl/futex-internal.h | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sysdeps/nptl/aio_misc.h b/sysdeps/nptl/aio_misc.h index 3f195f4794..effe94efaa 100644 --- a/sysdeps/nptl/aio_misc.h +++ b/sysdeps/nptl/aio_misc.h @@ -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); \ \ diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c index 11031cc46a..22ef312c2a 100644 --- a/sysdeps/nptl/futex-internal.c +++ b/sysdeps/nptl/futex-internal.c @@ -112,6 +112,7 @@ __futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected, return __futex_abstimed_wait_common64 (futex_word, expected, clockid, abstime, private, false); } +libpthread_hidden_def (__futex_abstimed_wait64) int __futex_abstimed_wait_cancelable64 (unsigned int* futex_word, @@ -122,3 +123,4 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word, return __futex_abstimed_wait_common64 (futex_word, expected, clockid, abstime, private, true); } +libpthread_hidden_def (__futex_abstimed_wait_cancelable64) diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h index e67803952f..1640da0ce8 100644 --- a/sysdeps/nptl/futex-internal.h +++ b/sysdeps/nptl/futex-internal.h @@ -405,13 +405,15 @@ int __futex_abstimed_wait_cancelable64 (unsigned int* futex_word, unsigned int expected, clockid_t clockid, const struct __timespec64* abstime, - int private) attribute_hidden; + int private); +libpthread_hidden_proto (__futex_abstimed_wait_cancelable64); int __futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected, clockid_t clockid, const struct __timespec64* abstime, - int private) attribute_hidden; + int private); +libpthread_hidden_proto (__futex_abstimed_wait64); static __always_inline int |