From 2e39f65b5ef11647beb4980c4244bac8af192c14 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 23 Nov 2020 15:26:42 -0300 Subject: nptl: Remove futex_wait_cancelable It is used solely on __pthread_cond_wait_common and the call can be replaced by a __futex_abstimed_wait_cancelable64 one. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski --- nptl/pthread_cond_wait.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'nptl/pthread_cond_wait.c') diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c index 7d158d553f..685dbca32f 100644 --- a/nptl/pthread_cond_wait.c +++ b/nptl/pthread_cond_wait.c @@ -501,26 +501,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, cbuffer.private = private; __pthread_cleanup_push (&buffer, __condvar_cleanup_waiting, &cbuffer); - if (abstime == NULL) - { - /* Block without a timeout. */ - err = futex_wait_cancelable ( - cond->__data.__g_signals + g, 0, private); - } - else - { - /* Block, but with a timeout. - Work around the fact that the kernel rejects negative timeout - values despite them being valid. */ - if (__glibc_unlikely (abstime->tv_sec < 0)) - err = ETIMEDOUT; - else - { - err = __futex_abstimed_wait_cancelable64 - (cond->__data.__g_signals + g, 0, clockid, abstime, - private); - } - } + err = __futex_abstimed_wait_cancelable64 ( + cond->__data.__g_signals + g, 0, clockid, abstime, private); __pthread_cleanup_pop (&buffer, 0); -- cgit 1.4.1