mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13:30:06 +00:00
cc5d5852c6
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>
127 lines
4.6 KiB
C
127 lines
4.6 KiB
C
/* futex helper functions for glibc-internal use.
|
|
Copyright (C) 2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sysdep.h>
|
|
#include <time.h>
|
|
#include <futex-internal.h>
|
|
#include <kernel-features.h>
|
|
|
|
#ifndef __ASSUME_TIME64_SYSCALLS
|
|
static int
|
|
__futex_abstimed_wait_common32 (unsigned int* futex_word,
|
|
unsigned int expected, int op,
|
|
const struct __timespec64* abstime,
|
|
int private, bool cancel)
|
|
{
|
|
struct timespec ts32, *pts32 = NULL;
|
|
if (abstime != NULL)
|
|
{
|
|
if (! in_time_t_range (abstime->tv_sec))
|
|
return -EOVERFLOW;
|
|
|
|
ts32 = valid_timespec64_to_timespec (*abstime);
|
|
pts32 = &ts32;
|
|
}
|
|
|
|
if (cancel)
|
|
return INTERNAL_SYSCALL_CANCEL (futex, futex_word, op, expected,
|
|
pts32, NULL /* Unused. */,
|
|
FUTEX_BITSET_MATCH_ANY);
|
|
else
|
|
return INTERNAL_SYSCALL_CALL (futex, futex_word, op, expected,
|
|
pts32, NULL /* Unused. */,
|
|
FUTEX_BITSET_MATCH_ANY);
|
|
}
|
|
#endif /* ! __ASSUME_TIME64_SYSCALLS */
|
|
|
|
static int
|
|
__futex_abstimed_wait_common64 (unsigned int* futex_word,
|
|
unsigned int expected, clockid_t clockid,
|
|
const struct __timespec64* abstime,
|
|
int private, bool cancel)
|
|
{
|
|
unsigned int clockbit;
|
|
int err;
|
|
|
|
/* Work around the fact that the kernel rejects negative timeout values
|
|
despite them being valid. */
|
|
if (__glibc_unlikely ((abstime != NULL) && (abstime->tv_sec < 0)))
|
|
return ETIMEDOUT;
|
|
|
|
if (! lll_futex_supported_clockid (clockid))
|
|
return EINVAL;
|
|
|
|
clockbit = (clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0;
|
|
int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private);
|
|
|
|
if (cancel)
|
|
err = INTERNAL_SYSCALL_CANCEL (futex_time64, futex_word, op, expected,
|
|
abstime, NULL /* Unused. */,
|
|
FUTEX_BITSET_MATCH_ANY);
|
|
else
|
|
err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op, expected,
|
|
abstime, NULL /* Ununsed. */,
|
|
FUTEX_BITSET_MATCH_ANY);
|
|
#ifndef __ASSUME_TIME64_SYSCALLS
|
|
if (err == -ENOSYS)
|
|
err = __futex_abstimed_wait_common32 (futex_word, expected, op, abstime,
|
|
private, cancel);
|
|
#endif
|
|
|
|
switch (err)
|
|
{
|
|
case 0:
|
|
case -EAGAIN:
|
|
case -EINTR:
|
|
case -ETIMEDOUT:
|
|
case -EINVAL:
|
|
case -EOVERFLOW: /* Passed absolute timeout uses 64 bit time_t type, but
|
|
underlying kernel does not support 64 bit time_t futex
|
|
syscalls. */
|
|
return -err;
|
|
|
|
case -EFAULT: /* Must have been caused by a glibc or application bug. */
|
|
case -ENOSYS: /* Must have been caused by a glibc bug. */
|
|
/* No other errors are documented at this time. */
|
|
default:
|
|
futex_fatal_error ();
|
|
}
|
|
}
|
|
|
|
int
|
|
__futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected,
|
|
clockid_t clockid,
|
|
const struct __timespec64* abstime, int private)
|
|
{
|
|
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,
|
|
unsigned int expected, clockid_t clockid,
|
|
const struct __timespec64* abstime,
|
|
int private)
|
|
{
|
|
return __futex_abstimed_wait_common64 (futex_word, expected, clockid,
|
|
abstime, private, true);
|
|
}
|
|
libpthread_hidden_def (__futex_abstimed_wait_cancelable64)
|