diff mbox series

[06/13] linux: nptl: Remove _futex_clock_wait_bitset64

Message ID 20201123195256.3336217-6-adhemerval.zanella@linaro.org
State Committed
Headers show
Series [01/13] linux: Remove unused internal futex functions | expand

Commit Message

Adhemerval Zanella Nov. 23, 2020, 7:52 p.m. UTC
It can be replaced with a __futex_abstimed_wait64 call.

Checked on x86_64-linux-gnu and i686-linux-gnu.
---
 nptl/pthread_mutex_timedlock.c |  7 +++---
 sysdeps/nptl/futex-internal.c  | 46 ----------------------------------
 sysdeps/nptl/futex-internal.h  |  5 ----
 3 files changed, 4 insertions(+), 54 deletions(-)

Comments

Lukasz Majewski Nov. 24, 2020, 6:26 p.m. UTC | #1
Hi Adhemerval,

> It can be replaced with a __futex_abstimed_wait64 call.
> 
> Checked on x86_64-linux-gnu and i686-linux-gnu.
> ---
>  nptl/pthread_mutex_timedlock.c |  7 +++---
>  sysdeps/nptl/futex-internal.c  | 46
> ---------------------------------- sysdeps/nptl/futex-internal.h  |
> 5 ---- 3 files changed, 4 insertions(+), 54 deletions(-)
> 
> diff --git a/nptl/pthread_mutex_timedlock.c
> b/nptl/pthread_mutex_timedlock.c index de88e9fc25..0ec47359be 100644
> --- a/nptl/pthread_mutex_timedlock.c
> +++ b/nptl/pthread_mutex_timedlock.c
> @@ -265,12 +265,13 @@ __pthread_mutex_clocklock_common
> (pthread_mutex_t *mutex, assume_other_futex_waiters |= FUTEX_WAITERS;
>  
>  	  /* 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,
>  	      PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
>  	  /* The futex call timed out.  */
> -	  if (err == -ETIMEDOUT)
> -	    return -err;
> +	  if (err == ETIMEDOUT)
> +	    return err;
>  	  /* Reload current lock value.  */
>  	  oldval = mutex->__data.__lock;
>  	}
> diff --git a/sysdeps/nptl/futex-internal.c
> b/sysdeps/nptl/futex-internal.c index f9a2e28ee6..30c662547f 100644
> --- a/sysdeps/nptl/futex-internal.c
> +++ b/sysdeps/nptl/futex-internal.c
> @@ -48,27 +48,6 @@ __futex_abstimed_wait_common32 (unsigned int*
> futex_word, pts32, NULL /* Unused.  */,
>                                    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 */
>  
>  static int
> @@ -198,28 +177,3 @@ __futex_clocklock_wait64 (int *futex, int val,
> clockid_t clockid, 
>    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;
> -}
> diff --git a/sysdeps/nptl/futex-internal.h
> b/sysdeps/nptl/futex-internal.h index cefab74301..dcc7958d59 100644
> --- a/sysdeps/nptl/futex-internal.h
> +++ b/sysdeps/nptl/futex-internal.h
> @@ -440,9 +440,4 @@ __futex_clocklock64 (int *futex, clockid_t
> clockid, 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 */

Reviewed-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
diff mbox series

Patch

diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
index de88e9fc25..0ec47359be 100644
--- a/nptl/pthread_mutex_timedlock.c
+++ b/nptl/pthread_mutex_timedlock.c
@@ -265,12 +265,13 @@  __pthread_mutex_clocklock_common (pthread_mutex_t *mutex,
 	  assume_other_futex_waiters |= FUTEX_WAITERS;
 
 	  /* 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,
 	      PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
 	  /* The futex call timed out.  */
-	  if (err == -ETIMEDOUT)
-	    return -err;
+	  if (err == ETIMEDOUT)
+	    return err;
 	  /* Reload current lock value.  */
 	  oldval = mutex->__data.__lock;
 	}
diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c
index f9a2e28ee6..30c662547f 100644
--- a/sysdeps/nptl/futex-internal.c
+++ b/sysdeps/nptl/futex-internal.c
@@ -48,27 +48,6 @@  __futex_abstimed_wait_common32 (unsigned int* futex_word,
                                   pts32, NULL /* Unused.  */,
                                   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 */
 
 static int
@@ -198,28 +177,3 @@  __futex_clocklock_wait64 (int *futex, int val, clockid_t clockid,
 
   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;
-}
diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h
index cefab74301..dcc7958d59 100644
--- a/sysdeps/nptl/futex-internal.h
+++ b/sysdeps/nptl/futex-internal.h
@@ -440,9 +440,4 @@  __futex_clocklock64 (int *futex, clockid_t clockid,
   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 */