mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-29 05:51:10 +00:00
eb76e5b465
Patch ce7eb0e903 ("nptl: Cleanup cancellation macros") changed the
join sequence for internal common __pthread_timedjoin_ex to use the
new macro lll_wait_tid. The idea was this macro would issue the
cancellable futex operation depending whether the timeout is used or
not. However if a timeout is used, __lll_timedwait_tid is called and
it is not a cancellable entrypoint.
This patch fixes it by simplifying the code in various ways:
- Instead of adding the cancellation handling on __lll_timedwait_tid,
it moves the generic implementation to pthread_join_common.c (called
now timedwait_tid with some fixes to use the correct type for pid).
- The llvm_wait_tid macro is removed, along with its replication on
x86_64, i686, and sparc arch-specific lowlevellock.h.
- sparc32 __lll_timedwait_tid is also removed, since the code is similar
to generic one.
- x86_64 and i386 provides arch-specific __lll_timedwait_tid which is
also removed since they are similar in functionality to generic C code
and there is no indication it is better than compiler generated code.
New tests, tst-join8 and tst-join9, are provided to check if
pthread_timedjoin_np acts as a cancellation point.
Checked on x86_64-linux-gnu, i686-linux-gnu, sparcv9-linux-gnu, and
aarch64-linux-gnu.
[BZ #24215]
* nptl/Makefile (lpthread-routines): Remove lll_timedwait_tid.
(tests): Add tst-join8 tst-join9.
* nptl/lll_timedwait_tid.c: Remove file.
* sysdeps/sparc/sparc32/lll_timedwait_tid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/lll_timedwait_tid.c: Likewise.
* sysdeps/sysv/linux/x86_64/lll_timedwait_tid.c: Likewise.
* nptl/pthread_join_common.c (timedwait_tid): New function.
(__pthread_timedjoin_ex): Act as cancellation entrypoint is block
is set.
* nptl/tst-join5.c (thread_join): New function.
(tf1, tf2, do_test): Use libsupport and add pthread_timedjoin_np
check.
* nptl/tst-join8.c: New file.
* nptl/tst-join9.c: Likewise.
* sysdeps/nptl/lowlevellock-futex.h (lll_futex_wait_cancel,
lll_futex_timed_wait_cancel): Add generic macros.
* sysdeps/nptl/lowlevellock.h (__lll_timedwait_tid, lll_wait_tid):
Remove definitions.
* sysdeps/unix/sysv/linux/i386/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
* sysdeps/sparc/sparc32/lowlevellock.c (__lll_timedwait_tid):
Remove function.
* sysdeps/unix/sysv/linux/i386/lowlevellock.S (__lll_timedwait_tid):
Likewise.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise.
* sysdeps/unix/sysv/linux/lowlevellock-futex.h
(lll_futex_timed_wait_cancel): New macro.
92 lines
2.5 KiB
C
92 lines
2.5 KiB
C
/* low level locking for pthread library. SPARC version.
|
|
Copyright (C) 2003-2019 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 <errno.h>
|
|
#include <sysdep.h>
|
|
#include <lowlevellock.h>
|
|
#include <sys/time.h>
|
|
|
|
|
|
void
|
|
__lll_lock_wait_private (int *futex)
|
|
{
|
|
do
|
|
{
|
|
int oldval = atomic_compare_and_exchange_val_24_acq (futex, 2, 1);
|
|
if (oldval != 0)
|
|
lll_futex_wait (futex, 2, LLL_PRIVATE);
|
|
}
|
|
while (atomic_compare_and_exchange_val_24_acq (futex, 2, 0) != 0);
|
|
}
|
|
|
|
|
|
/* These functions don't get included in libc.so */
|
|
#if IS_IN (libpthread)
|
|
void
|
|
__lll_lock_wait (int *futex, int private)
|
|
{
|
|
do
|
|
{
|
|
int oldval = atomic_compare_and_exchange_val_24_acq (futex, 2, 1);
|
|
if (oldval != 0)
|
|
lll_futex_wait (futex, 2, private);
|
|
}
|
|
while (atomic_compare_and_exchange_val_24_acq (futex, 2, 0) != 0);
|
|
}
|
|
|
|
|
|
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;
|
|
|
|
do
|
|
{
|
|
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;
|
|
|
|
/* Wait. */
|
|
int oldval = atomic_compare_and_exchange_val_24_acq (futex, 2, 1);
|
|
if (oldval != 0)
|
|
lll_futex_timed_wait (futex, 2, &rt, private);
|
|
}
|
|
while (atomic_compare_and_exchange_val_24_acq (futex, 2, 0) != 0);
|
|
|
|
return 0;
|
|
}
|
|
#endif
|