qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nptl: Remove _futex_clock_wait_bitset64 

It can be replaced with a __futex_abstimed_wait64 call.

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 11:40:46 -03:00
parent a2b9e1ec9c
commit a52665818a
3 changed files with 4 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nptl/pthread_mutex_timedlock.c
View File

@ -265,12 +265,13 @@ __pthread_mutex_clocklock_common (pthread_mutex_t *mutex,
assume_other_futex_waiters |= FUTEX_WAITERS; assume_other_futex_waiters |= FUTEX_WAITERS;
/* Block using the futex. */ /* Block using the futex. */
int err = __futex_clock_wait_bitset64 (&mutex->__data.__lock, int err = __futex_abstimed_wait64 (
(unsigned int *) &mutex->__data.__lock,
oldval, clockid, abstime, oldval, clockid, abstime,
PTHREAD_ROBUST_MUTEX_PSHARED (mutex)); PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
/* The futex call timed out. */ /* The futex call timed out. */
if (err == -ETIMEDOUT) if (err == ETIMEDOUT)
return -err; return err;
/* Reload current lock value. */ /* Reload current lock value. */
oldval = mutex->__data.__lock; oldval = mutex->__data.__lock;
} }

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

@ -48,27 +48,6 @@ __futex_abstimed_wait_common32 (unsigned int* futex_word,
pts32, NULL /* Unused. */, pts32, NULL /* Unused. */,
FUTEX_BITSET_MATCH_ANY); FUTEX_BITSET_MATCH_ANY);
} }
static int
__futex_clock_wait_bitset32 (int *futexp, int val, clockid_t clockid,
const struct __timespec64 *abstime, int private)
{
struct timespec ts32;
if (abstime != NULL && ! in_time_t_range (abstime->tv_sec))
return -EOVERFLOW;
const unsigned int clockbit =
(clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0;
const int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private);
if (abstime != NULL)
ts32 = valid_timespec64_to_timespec (*abstime);
return INTERNAL_SYSCALL_CALL (futex, futexp, op, val,
abstime != NULL ? &ts32 : NULL,
NULL /* Unused. */, FUTEX_BITSET_MATCH_ANY);
}
#endif /* ! __ASSUME_TIME64_SYSCALLS */ #endif /* ! __ASSUME_TIME64_SYSCALLS */
static int static int
@ -198,28 +177,3 @@ __futex_clocklock_wait64 (int *futex, int val, clockid_t clockid,
return -err; return -err;
} }
int
__futex_clock_wait_bitset64 (int *futexp, int val, clockid_t clockid,
const struct __timespec64 *abstime,
int private)
{
int ret;
if (! lll_futex_supported_clockid (clockid))
{
return -EINVAL;
}
const unsigned int clockbit =
(clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0;
const int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private);
ret = INTERNAL_SYSCALL_CALL (futex_time64, futexp, op, val,
abstime, NULL /* Unused. */,
FUTEX_BITSET_MATCH_ANY);
#ifndef __ASSUME_TIME64_SYSCALLS
if (ret == -ENOSYS)
ret = __futex_clock_wait_bitset32 (futexp, val, clockid, abstime, private);
#endif
return ret;
}

5
sysdeps/nptl/futex-internal.h
View File

@ -436,9 +436,4 @@ __futex_clocklock64 (int *futex, clockid_t clockid,
return err; return err;
} }
int
__futex_clock_wait_bitset64 (int *futexp, int val, clockid_t clockid,
const struct __timespec64 *abstime,
int private) attribute_hidden;
#endif /* futex-internal.h */ #endif /* futex-internal.h */