Split timed-wait functions out of nptl/lowlevellock.c.

ChangeLog

@@ -1,3 +1,22 @@
+2015-05-26  Roland McGrath  <roland@hack.frob.com>
+
+	* nptl/lowlevellock.c (__lll_timedlock_wait): Moved ...
+	* nptl/lll_timedlock_wait.c: ... to this new file.
+	* nptl/Makefile (libpthread-routines): Add it.
+	* nptl/lowlevellock.c (__lll_timedwait_tid): Moved ...
+	* nptl/lll_timedwait_tid.c: ... to this new file.
+	* nptl/Makefile (libpthread-routines): Add it.
+	* sysdeps/sparc/sparc32/lll_timedlock_wait.c: New file.
+	* sysdeps/sparc/sparc32/lll_timedwait_tid.c: New file.
+	* sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c: New file.
+	* sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c: New file.
+	* sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c: New file.
+	* sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c: New file.
+	* sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c: New file.
+	* sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c: New file.
+	* sysdeps/unix/sysv/linux/x86_64/lll_timedlock_wait.c: New file.
+	* sysdeps/unix/sysv/linux/x86_64/lll_timedwait_tid.c: New file.
+
 2015-05-26  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/unix/sysv/linux/aarch64/gettimeofday.c: Remove file.

nptl/Makefile

@@ -106,6 +106,7 @@ libpthread-routines = nptl-init vars events version \
 		      pt-longjmp pt-cleanup\
 		      cancellation \
 		      lowlevellock lowlevelrobustlock \
+		      lll_timedlock_wait lll_timedwait_tid \
 		      pt-fork pt-vfork \
 		      ptw-write ptw-read ptw-close ptw-fcntl ptw-accept \
 		      ptw-connect ptw-recv ptw-recvfrom ptw-recvmsg ptw-send \

nptl/lll_timedlock_wait.c

@@ -0,0 +1,59 @@
+/* Timed low level locking for pthread library.  Generic futex-using version.
+   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <atomic.h>
+#include <errno.h>
+#include <lowlevellock.h>
+#include <sys/time.h>
+
+
+int
+__lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
+{
+  /* Reject invalid timeouts.  */
+  if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
+    return EINVAL;
+
+  /* Try locking.  */
+  while (atomic_exchange_acq (futex, 2) != 0)
+    {
+      struct timeval tv;
+
+      /* Get the current time.  */
+      (void) __gettimeofday (&tv, NULL);
+
+      /* Compute relative timeout.  */
+      struct timespec rt;
+      rt.tv_sec = abstime->tv_sec - tv.tv_sec;
+      rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
+      if (rt.tv_nsec < 0)
+        {
+          rt.tv_nsec += 1000000000;
+          --rt.tv_sec;
+        }
+
+      if (rt.tv_sec < 0)
+        return ETIMEDOUT;
+
+      /* If *futex == 2, wait until woken or timeout.  */
+      lll_futex_timed_wait (futex, 2, &rt, private);
+    }
+
+  return 0;
+}

nptl/lll_timedwait_tid.c

@@ -0,0 +1,70 @@
+/* Timed waiting for thread death.  Generic futex-using version.
+   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <atomic.h>
+#include <errno.h>
+#include <lowlevellock.h>
+#include <sys/time.h>
+
+
+/* The kernel notifies a process which uses CLONE_CHILD_CLEARTID via futex
+   wake-up when the clone terminates.  The memory location contains the
+   thread ID while the clone is running and is reset to zero by the kernel
+   afterwards.  The kernel up to version 3.16.3 does not use the private futex
+   operations for futex wake-up when the clone terminates.  */
+int
+__lll_timedwait_tid (int *tidp, const struct timespec *abstime)
+{
+  int tid;
+
+  if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
+    return EINVAL;
+
+  /* Repeat until thread terminated.  */
+  while ((tid = *tidp) != 0)
+    {
+      struct timeval tv;
+      struct timespec rt;
+
+      /* Get the current time.  */
+      (void) __gettimeofday (&tv, NULL);
+
+      /* Compute relative timeout.  */
+      rt.tv_sec = abstime->tv_sec - tv.tv_sec;
+      rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
+      if (rt.tv_nsec < 0)
+        {
+          rt.tv_nsec += 1000000000;
+          --rt.tv_sec;
+        }
+
+      /* Already timed out?  */
+      if (rt.tv_sec < 0)
+        return ETIMEDOUT;
+
+      /* If *tidp == tid, wait until thread terminates or the wait times out.
+         The kernel up to version 3.16.3 does not use the private futex
+         operations for futex wake-up when the clone terminates.
+      */
+      if (lll_futex_timed_wait (tidp, tid, &rt, LLL_SHARED) == -ETIMEDOUT)
+        return ETIMEDOUT;
+    }
+
+  return 0;
+}

nptl/lowlevellock.c

@@ -34,7 +34,7 @@ __lll_lock_wait_private (int *futex)
 }
 
 
-/* These functions don't get included in libc.so  */
+/* This function doesn't get included in libc.  */
 #if IS_IN (libpthread)
 void
 __lll_lock_wait (int *futex, int private)
@@ -45,87 +45,4 @@ __lll_lock_wait (int *futex, int private)
   while (atomic_exchange_acq (futex, 2) != 0)
     lll_futex_wait (futex, 2, private); /* Wait if *futex == 2.  */
 }
-
-
-int
-__lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
-{
-  /* Reject invalid timeouts.  */
-  if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
-    return EINVAL;
-
-  /* Try locking.  */
-  while (atomic_exchange_acq (futex, 2) != 0)
-    {
-      struct timeval tv;
-
-      /* Get the current time.  */
-      (void) __gettimeofday (&tv, NULL);
-
-      /* Compute relative timeout.  */
-      struct timespec rt;
-      rt.tv_sec = abstime->tv_sec - tv.tv_sec;
-      rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
-      if (rt.tv_nsec < 0)
-	{
-	  rt.tv_nsec += 1000000000;
-	  --rt.tv_sec;
-	}
-
-      if (rt.tv_sec < 0)
-	return ETIMEDOUT;
-
-      /* If *futex == 2, wait until woken or timeout.  */
-      lll_futex_timed_wait (futex, 2, &rt, private);
-    }
-
-  return 0;
-}
-
-
-/* The kernel notifies a process which uses CLONE_CHILD_CLEARTID via futex
-   wake-up when the clone terminates.  The memory location contains the
-   thread ID while the clone is running and is reset to zero by the kernel
-   afterwards.  The kernel up to version 3.16.3 does not use the private futex
-   operations for futex wake-up when the clone terminates.  */
-int
-__lll_timedwait_tid (int *tidp, const struct timespec *abstime)
-{
-  int tid;
-
-  if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
-    return EINVAL;
-
-  /* Repeat until thread terminated.  */
-  while ((tid = *tidp) != 0)
-    {
-      struct timeval tv;
-      struct timespec rt;
-
-      /* Get the current time.  */
-      (void) __gettimeofday (&tv, NULL);
-
-      /* Compute relative timeout.  */
-      rt.tv_sec = abstime->tv_sec - tv.tv_sec;
-      rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
-      if (rt.tv_nsec < 0)
-	{
-	  rt.tv_nsec += 1000000000;
-	  --rt.tv_sec;
-	}
-
-      /* Already timed out?  */
-      if (rt.tv_sec < 0)
-	return ETIMEDOUT;
-
-      /* If *tidp == tid, wait until thread terminates or the wait times out.
-         The kernel up to version 3.16.3 does not use the private futex
-         operations for futex wake-up when the clone terminates.
-      */
-      if (lll_futex_timed_wait (tidp, tid, &rt, LLL_SHARED) == -ETIMEDOUT)
-	return ETIMEDOUT;
-    }
-
-  return 0;
-}
 #endif

sysdeps/sparc/sparc32/lll_timedlock_wait.c

@@ -0,0 +1 @@
+/* __lll_timedlock_wait is in lowlevellock.c.  */

sysdeps/sparc/sparc32/lll_timedwait_tid.c

@@ -0,0 +1 @@
+/* __lll_timedwait_tid is in lowlevellock.c.  */

sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c

@@ -0,0 +1 @@
+/* __lll_timedlock_wait is in lowlevellock.S.  */

sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c

@@ -0,0 +1 @@
+/* __lll_timedwait_tid is in lowlevellock.S.  */

sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c

@@ -0,0 +1 @@
+#include "../i486/lll_timedlock_wait.c"

sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c

@@ -0,0 +1 @@
+#include "../i486/lll_timedwait_tid.c"

sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c

@@ -0,0 +1 @@
+#include "../i486/lll_timedlock_wait.c"

sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c

@@ -0,0 +1 @@
+#include "../i486/lll_timedwait_tid.c"

sysdeps/unix/sysv/linux/x86_64/lll_timedlock_wait.c

@@ -0,0 +1 @@
+/* __lll_timedlock_wait is in lowlevellock.S.  */

sysdeps/unix/sysv/linux/x86_64/lll_timedwait_tid.c

@@ -0,0 +1 @@
+/* __lll_timedwait_tid is in lowlevellock.S.  */