AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-12 12:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

nptl: Consolidate __futex_abstimed_wait_{cancelable}64

Browse Source 
The only different is how to issue the syscall.

Checked on x86_64-linux-gnu and i686-linux-gnu.

Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Adhemerval Zanella 2020-11-21 10:39:26 -03:00
parent e77221a523
commit a2b9e1ec9c
1 changed files with 35 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
sysdeps/nptl/futex-internal.c
View File

@ -24,10 +24,10 @@
#ifndef __ASSUME_TIME64_SYSCALLS #ifndef __ASSUME_TIME64_SYSCALLS
static int static int
__futex_abstimed_wait_cancelable32 (unsigned int* futex_word, __futex_abstimed_wait_common32 (unsigned int* futex_word,
unsigned int expected, int op, unsigned int expected, int op,
const struct __timespec64* abstime, const struct __timespec64* abstime,
int private) int private, bool cancel)
{ {
struct timespec ts32, *pts32 = NULL; struct timespec ts32, *pts32 = NULL;
if (abstime != NULL) if (abstime != NULL)
@ -39,32 +39,14 @@ __futex_abstimed_wait_cancelable32 (unsigned int* futex_word,
pts32 = &ts32; pts32 = &ts32;
} }
if (cancel)
return INTERNAL_SYSCALL_CANCEL (futex, futex_word, op, expected, return INTERNAL_SYSCALL_CANCEL (futex, futex_word, op, expected,
pts32, NULL /* Unused. */, pts32, NULL /* Unused. */,
FUTEX_BITSET_MATCH_ANY); FUTEX_BITSET_MATCH_ANY);
} else
static int
__futex_abstimed_wait32 (unsigned int* futex_word,
unsigned int expected, clockid_t clockid,
const struct __timespec64* abstime,
int private)
{
struct timespec ts32;
if (abstime != NULL && ! in_time_t_range (abstime->tv_sec))
return -EOVERFLOW;
unsigned int clockbit = (clockid == CLOCK_REALTIME) ?
FUTEX_CLOCK_REALTIME : 0;
int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private);
if (abstime != NULL)
ts32 = valid_timespec64_to_timespec (*abstime);
return INTERNAL_SYSCALL_CALL (futex, futex_word, op, expected, return INTERNAL_SYSCALL_CALL (futex, futex_word, op, expected,
abstime != NULL ? &ts32 : NULL, pts32, NULL /* Unused. */,
NULL /* Unused. */, FUTEX_BITSET_MATCH_ANY); FUTEX_BITSET_MATCH_ANY);
} }
static int static int
@ -89,11 +71,11 @@ __futex_clock_wait_bitset32 (int *futexp, int val, clockid_t clockid,
} }
#endif /* ! __ASSUME_TIME64_SYSCALLS */ #endif /* ! __ASSUME_TIME64_SYSCALLS */
int static int
__futex_abstimed_wait_cancelable64 (unsigned int* futex_word, __futex_abstimed_wait_common64 (unsigned int* futex_word,
unsigned int expected, clockid_t clockid, unsigned int expected, clockid_t clockid,
const struct __timespec64* abstime, const struct __timespec64* abstime,
int private) int private, bool cancel)
{ {
unsigned int clockbit; unsigned int clockbit;
int err; int err;
@ -109,13 +91,18 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
clockbit = (clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0; clockbit = (clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0;
int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private); int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private);
if (cancel)
err = INTERNAL_SYSCALL_CANCEL (futex_time64, futex_word, op, expected, err = INTERNAL_SYSCALL_CANCEL (futex_time64, futex_word, op, expected,
abstime, NULL /* Unused. */, abstime, NULL /* Unused. */,
FUTEX_BITSET_MATCH_ANY); 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 #ifndef __ASSUME_TIME64_SYSCALLS
if (err == -ENOSYS) if (err == -ENOSYS)
err = __futex_abstimed_wait_cancelable32 (futex_word, expected, err = __futex_abstimed_wait_common32 (futex_word, expected, op, abstime,
op, abstime, private); private, cancel);
#endif #endif
switch (err) switch (err)
@ -145,46 +132,18 @@ __futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected,
clockid_t clockid, clockid_t clockid,
const struct __timespec64* abstime, int private) const struct __timespec64* abstime, int private)
{ {
unsigned int clockbit; return __futex_abstimed_wait_common64 (futex_word, expected, clockid,
int err; abstime, private, false);
/* 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);
err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op, expected,
abstime, NULL /* Unused. */,
FUTEX_BITSET_MATCH_ANY);
#ifndef __ASSUME_TIME64_SYSCALLS
if (err == -ENOSYS)
err = __futex_abstimed_wait32 (futex_word, expected,
clockid, abstime, private);
#endif
switch (err)
{
case 0:
case -EAGAIN:
case -EINTR:
case -ETIMEDOUT:
return -err;
case -EFAULT: /* Must have been caused by a glibc or application bug. */
case -EINVAL: /* Either due to wrong alignment, unsupported
clockid or due to the timeout not being
normalized. 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_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);
} }
int int