From patchwork Tue May 26 22:17:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 476763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DEDC41406AA for ; Wed, 27 May 2015 08:17:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sourceware.org header.i=@sourceware.org header.b=kTAEubRv; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=t2Uor3PpeM//ysa16BI2eSAxTsHrYmNYdU7lW4xsQzrjfE iR6Oj/9ModcbofuuYMAEEwWN7P+C+52Pb6vDPRLpDUHpS+qSwmxNcSSD4StBAEBp 37O+5jOHgrajek1k/udhDT//tX9yfLUUpZHqNLxcfoNi7gXyc45Lz2tauFe1A= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=pBDsCpq4qOR0dCk0yY7wXwkhV2M=; b=kTAEubRvgN5eYh4unNvr xY+V24e/NVTWUkdBjhYPkc2syXDRhjvETQM3DYujWCz49ajC1QnLTMOaAhfmgqWJ QCprwmRp/t9iRRN0+yDiES7s6MW+UEX0ewzicMtXYGKzxV48SCoKikRC+9OsQea9 pwBIHYMKzhjBvqIq6wAcRCU= Received: (qmail 19269 invoked by alias); 26 May 2015 22:17:33 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 19253 invoked by uid 89); 26 May 2015 22:17:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] Split timed-wait functions out of nptl/lowlevellock.c. Message-Id: <20150526221729.7B7762C39FC@topped-with-meat.com> Date: Tue, 26 May 2015 15:17:29 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=VnNF1IyMAAAA:8 a=mDV3o1hIAAAA:8 a=hCwW-DnNboSBW0CAcgYA:9 a=CjuIK1q_8ugA:10 This lets a configuration replace __lll_timedlock_wait and/or __lll_timedwait_tid with different implementations while still using the generic code for __lll_lock_wait{,_private}. Build-tested x86_64-linux-gnu, i686-linux-gnu, and arm-linux-gnueabihf. This does nothing but move code around (and not even that on i?86, x86_64, and sparc32), so it should change nothing except possibly the order of these functions in the libpthread.so text segment (and statically-linked -lpthread applications' text segments). Thanks, Roland 2015-05-26 Roland McGrath * 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. diff --git a/nptl/Makefile b/nptl/Makefile index 8e99452..3dd2944 100644 --- a/nptl/Makefile +++ b/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 \ diff --git a/nptl/lll_timedlock_wait.c b/nptl/lll_timedlock_wait.c new file mode 100644 index 0000000..37cf083 --- /dev/null +++ b/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 , 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 + . */ + +#include +#include +#include +#include + + +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; +} diff --git a/nptl/lll_timedwait_tid.c b/nptl/lll_timedwait_tid.c new file mode 100644 index 0000000..68b4857 --- /dev/null +++ b/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 , 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 + . */ + +#include +#include +#include +#include + + +/* 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; +} diff --git a/nptl/lowlevellock.c b/nptl/lowlevellock.c index 98c859f..7025b9e 100644 --- a/nptl/lowlevellock.c +++ b/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 diff --git a/sysdeps/sparc/sparc32/lll_timedlock_wait.c b/sysdeps/sparc/sparc32/lll_timedlock_wait.c new file mode 100644 index 0000000..c2c93fa --- /dev/null +++ b/sysdeps/sparc/sparc32/lll_timedlock_wait.c @@ -0,0 +1 @@ +/* __lll_timedlock_wait is in lowlevellock.c. */ diff --git a/sysdeps/sparc/sparc32/lll_timedwait_tid.c b/sysdeps/sparc/sparc32/lll_timedwait_tid.c new file mode 100644 index 0000000..511608e --- /dev/null +++ b/sysdeps/sparc/sparc32/lll_timedwait_tid.c @@ -0,0 +1 @@ +/* __lll_timedwait_tid is in lowlevellock.c. */ diff --git a/sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c b/sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c new file mode 100644 index 0000000..f6875b8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c @@ -0,0 +1 @@ +/* __lll_timedlock_wait is in lowlevellock.S. */ diff --git a/sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c b/sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c new file mode 100644 index 0000000..43900c6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c @@ -0,0 +1 @@ +/* __lll_timedwait_tid is in lowlevellock.S. */ diff --git a/sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c b/sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c new file mode 100644 index 0000000..fa4357b --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c @@ -0,0 +1 @@ +#include "../i486/lll_timedlock_wait.c" diff --git a/sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c b/sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c new file mode 100644 index 0000000..1586104 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c @@ -0,0 +1 @@ +#include "../i486/lll_timedwait_tid.c" diff --git a/sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c b/sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c new file mode 100644 index 0000000..fa4357b --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c @@ -0,0 +1 @@ +#include "../i486/lll_timedlock_wait.c" diff --git a/sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c b/sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c new file mode 100644 index 0000000..1586104 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c @@ -0,0 +1 @@ +#include "../i486/lll_timedwait_tid.c" diff --git a/sysdeps/unix/sysv/linux/x86_64/lll_timedlock_wait.c b/sysdeps/unix/sysv/linux/x86_64/lll_timedlock_wait.c new file mode 100644 index 0000000..f6875b8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/lll_timedlock_wait.c @@ -0,0 +1 @@ +/* __lll_timedlock_wait is in lowlevellock.S. */ diff --git a/sysdeps/unix/sysv/linux/x86_64/lll_timedwait_tid.c b/sysdeps/unix/sysv/linux/x86_64/lll_timedwait_tid.c new file mode 100644 index 0000000..43900c6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/lll_timedwait_tid.c @@ -0,0 +1 @@ +/* __lll_timedwait_tid is in lowlevellock.S. */