From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Sat, 21 Nov 2020 14:40:46 +0000 (-0300)
Subject: nptl: Remove _futex_clock_wait_bitset64
X-Git-Tag: glibc-2.33~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a52665818adb76df1563ae7aa45e74e92d9acd59;p=thirdparty%2Fglibc.git

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>
---

diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
index de88e9fc252..0ec47359be2 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 f9a2e28ee6b..30c662547f5 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 8c1d592308d..91440637f17 100644
--- a/sysdeps/nptl/futex-internal.h
+++ b/sysdeps/nptl/futex-internal.h
@@ -436,9 +436,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 */