glibc/nptl/sem_wait.c

107 lines
3.3 KiB
C
Raw Normal View History

PowerPC port contributed by Paul Mackerras <paulus@samba.org>. * sysdeps/pthread/pthread_spin_init.c: New file. * sysdeps/pthread/pthread_spin_unlock.c: New file. * sysdeps/powerpc/Makefile: New file. * sysdeps/powerpc/pthread_spin_lock.c: New file. * sysdeps/powerpc/pthread_spin_trylock.c: New file. * sysdeps/powerpc/pthreaddef.h: New file. * sysdeps/powerpc/tcb-offsets.sym: New file. * sysdeps/powerpc/td_ta_map_lwp2thr.c: New file. * sysdeps/powerpc/tls.h: New file. * sysdeps/powerpc/bits/atomic.h: New file. * sysdeps/unix/sysv/linux/libc-lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/libc-lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/sem_post.c: New file. * sysdeps/unix/sysv/linux/sem_timedwait.c: New file. * sysdeps/unix/sysv/linux/sem_trywait.c: New file. * sysdeps/unix/sysv/linux/sem_wait.c: New file. * sysdeps/unix/sysv/linux/powerpc/Makefile: New file. * sysdeps/unix/sysv/linux/powerpc/createthread.c: New file. * sysdeps/unix/sysv/linux/powerpc/fork.c: New file. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file. * sysdeps/unix/sysv/linux/powerpc/pt-vfork.S: New file. * sysdeps/unix/sysv/linux/powerpc/pthread_once.c: New file. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/ia64/lowlevellock.c: Use __gettimeofday, not gettimeofday. * sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sem_timedwait.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise.
2003-03-17 19:25:18 +08:00
/* sem_wait -- wait on a semaphore. Generic futex-using version.
Copyright (C) 2003-2018 Free Software Foundation, Inc.
PowerPC port contributed by Paul Mackerras <paulus@samba.org>. * sysdeps/pthread/pthread_spin_init.c: New file. * sysdeps/pthread/pthread_spin_unlock.c: New file. * sysdeps/powerpc/Makefile: New file. * sysdeps/powerpc/pthread_spin_lock.c: New file. * sysdeps/powerpc/pthread_spin_trylock.c: New file. * sysdeps/powerpc/pthreaddef.h: New file. * sysdeps/powerpc/tcb-offsets.sym: New file. * sysdeps/powerpc/td_ta_map_lwp2thr.c: New file. * sysdeps/powerpc/tls.h: New file. * sysdeps/powerpc/bits/atomic.h: New file. * sysdeps/unix/sysv/linux/libc-lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/libc-lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/sem_post.c: New file. * sysdeps/unix/sysv/linux/sem_timedwait.c: New file. * sysdeps/unix/sysv/linux/sem_trywait.c: New file. * sysdeps/unix/sysv/linux/sem_wait.c: New file. * sysdeps/unix/sysv/linux/powerpc/Makefile: New file. * sysdeps/unix/sysv/linux/powerpc/createthread.c: New file. * sysdeps/unix/sysv/linux/powerpc/fork.c: New file. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file. * sysdeps/unix/sysv/linux/powerpc/pt-vfork.S: New file. * sysdeps/unix/sysv/linux/powerpc/pthread_once.c: New file. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/ia64/lowlevellock.c: Use __gettimeofday, not gettimeofday. * sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sem_timedwait.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise.
2003-03-17 19:25:18 +08:00
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/>. */
PowerPC port contributed by Paul Mackerras <paulus@samba.org>. * sysdeps/pthread/pthread_spin_init.c: New file. * sysdeps/pthread/pthread_spin_unlock.c: New file. * sysdeps/powerpc/Makefile: New file. * sysdeps/powerpc/pthread_spin_lock.c: New file. * sysdeps/powerpc/pthread_spin_trylock.c: New file. * sysdeps/powerpc/pthreaddef.h: New file. * sysdeps/powerpc/tcb-offsets.sym: New file. * sysdeps/powerpc/td_ta_map_lwp2thr.c: New file. * sysdeps/powerpc/tls.h: New file. * sysdeps/powerpc/bits/atomic.h: New file. * sysdeps/unix/sysv/linux/libc-lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/libc-lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/sem_post.c: New file. * sysdeps/unix/sysv/linux/sem_timedwait.c: New file. * sysdeps/unix/sysv/linux/sem_trywait.c: New file. * sysdeps/unix/sysv/linux/sem_wait.c: New file. * sysdeps/unix/sysv/linux/powerpc/Makefile: New file. * sysdeps/unix/sysv/linux/powerpc/createthread.c: New file. * sysdeps/unix/sysv/linux/powerpc/fork.c: New file. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file. * sysdeps/unix/sysv/linux/powerpc/pt-vfork.S: New file. * sysdeps/unix/sysv/linux/powerpc/pthread_once.c: New file. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/ia64/lowlevellock.c: Use __gettimeofday, not gettimeofday. * sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sem_timedwait.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise.
2003-03-17 19:25:18 +08:00
#include <lowlevellock.h> /* lll_futex* used by the old code. */
#include "sem_waitcommon.c"
PowerPC port contributed by Paul Mackerras <paulus@samba.org>. * sysdeps/pthread/pthread_spin_init.c: New file. * sysdeps/pthread/pthread_spin_unlock.c: New file. * sysdeps/powerpc/Makefile: New file. * sysdeps/powerpc/pthread_spin_lock.c: New file. * sysdeps/powerpc/pthread_spin_trylock.c: New file. * sysdeps/powerpc/pthreaddef.h: New file. * sysdeps/powerpc/tcb-offsets.sym: New file. * sysdeps/powerpc/td_ta_map_lwp2thr.c: New file. * sysdeps/powerpc/tls.h: New file. * sysdeps/powerpc/bits/atomic.h: New file. * sysdeps/unix/sysv/linux/libc-lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/libc-lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/sem_post.c: New file. * sysdeps/unix/sysv/linux/sem_timedwait.c: New file. * sysdeps/unix/sysv/linux/sem_trywait.c: New file. * sysdeps/unix/sysv/linux/sem_wait.c: New file. * sysdeps/unix/sysv/linux/powerpc/Makefile: New file. * sysdeps/unix/sysv/linux/powerpc/createthread.c: New file. * sysdeps/unix/sysv/linux/powerpc/fork.c: New file. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file. * sysdeps/unix/sysv/linux/powerpc/pt-vfork.S: New file. * sysdeps/unix/sysv/linux/powerpc/pthread_once.c: New file. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/ia64/lowlevellock.c: Use __gettimeofday, not gettimeofday. * sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sem_timedwait.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise.
2003-03-17 19:25:18 +08:00
int
__new_sem_wait (sem_t *sem)
{
nptl: Fix sem_wait and sem_timedwait cancellation (BZ#18243) This patch fixes both sem_wait and sem_timedwait cancellation point for uncontended case. In this scenario only atomics are involved and thus the futex cancellable call is not issue and a pending cancellation signal is not handled. The fix is straighforward by calling pthread_testcancel is both function start. Although it would be simpler to call CANCELLATION_P directly, I decided to add an internal pthread_testcancel alias and use it to export less internal implementation on such function. A possible change on how pthread_testcancel is internally implemented would lead to either continue to force use CANCELLATION_P or to adjust its every use. GLIBC testcase also does have tests for uncontended cases, test-cancel12 and test-cancel14.c, however both are flawed by adding another cancellation point just after thread pthread_cleanup_pop: 47 static void * 48 tf (void *arg) 49 { 50 pthread_cleanup_push (cleanup, NULL); 51 52 int e = pthread_barrier_wait (&bar); 53 if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) 54 { 55 puts ("tf: 1st barrier_wait failed"); 56 exit (1); 57 } 58 59 /* This call should block and be cancelable. */ 60 sem_wait (&sem); 61 62 pthread_cleanup_pop (0); 63 64 puts ("sem_wait returned"); 65 66 return NULL; 67 } So sem_{timed}wait does not act on cancellation, pthread_cleanup_pop executes 'cleanup' and then 'puts' acts on cancellation. Since pthread_cleanup_pop removed the clean-up handler, it will ran only once and thus it won't accuse an error to indicate sem_wait has not acted on the cancellation signal. This patch also fixes this behavior by removing the cancellation point 'puts'. It also adds some cleanup on all sem_{timed}wait cancel tests. It partially fixes BZ #18243. Checked on x86_64. [BZ #18243] * nptl/pthreadP.h (__pthread_testcancel): Add prototype and hidden_proto. * nptl/pthread_testcancel.c (pthread_cancel): Add internal aliais definition. * nptl/sem_timedwait.c (sem_timedwait): Add cancellation check for uncontended case. * nptl/sem_wait.c (__new_sem_wait): Likewise. * nptl/tst-cancel12.c (cleanup): Remove wrong cancellation point. (tf): Fix check for uncontended case. (do_test): Likewise. * nptl/tst-cancel13.c (cleanup): Remove wrong cancellation point. (tf): Fix check for uncontended case. (do_test): Likewise. * nptl/tst-cancel14.c (cleanup): Remove wrong cancellation point. (tf): Fix check for uncontended case. (do_test): Likewise. * nptl/tst-cancel15.c (cleanup): Remove wrong cancellation point. (tf): Fix check for uncontended case. (do_test): Likewise.
2016-08-22 20:39:46 +08:00
/* We need to check whether we need to act upon a cancellation request here
because POSIX specifies that cancellation points "shall occur" in
sem_wait and sem_timedwait, which also means that they need to check
this regardless whether they block or not (unlike "may occur"
functions). See the POSIX Rationale for this requirement: Section
"Thread Cancellation Overview" [1] and austin group issue #1076 [2]
for thoughs on why this may be a suboptimal design.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_xsh_chap02.html
[2] http://austingroupbugs.net/view.php?id=1076 for thoughts on why this
*/
__pthread_testcancel ();
if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
return 0;
else
return __new_sem_wait_slow((struct new_sem *) sem, NULL);
}
versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
int
attribute_compat_text_section
__old_sem_wait (sem_t *sem)
PowerPC port contributed by Paul Mackerras <paulus@samba.org>. * sysdeps/pthread/pthread_spin_init.c: New file. * sysdeps/pthread/pthread_spin_unlock.c: New file. * sysdeps/powerpc/Makefile: New file. * sysdeps/powerpc/pthread_spin_lock.c: New file. * sysdeps/powerpc/pthread_spin_trylock.c: New file. * sysdeps/powerpc/pthreaddef.h: New file. * sysdeps/powerpc/tcb-offsets.sym: New file. * sysdeps/powerpc/td_ta_map_lwp2thr.c: New file. * sysdeps/powerpc/tls.h: New file. * sysdeps/powerpc/bits/atomic.h: New file. * sysdeps/unix/sysv/linux/libc-lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/libc-lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/sem_post.c: New file. * sysdeps/unix/sysv/linux/sem_timedwait.c: New file. * sysdeps/unix/sysv/linux/sem_trywait.c: New file. * sysdeps/unix/sysv/linux/sem_wait.c: New file. * sysdeps/unix/sysv/linux/powerpc/Makefile: New file. * sysdeps/unix/sysv/linux/powerpc/createthread.c: New file. * sysdeps/unix/sysv/linux/powerpc/fork.c: New file. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file. * sysdeps/unix/sysv/linux/powerpc/pt-vfork.S: New file. * sysdeps/unix/sysv/linux/powerpc/pthread_once.c: New file. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/ia64/lowlevellock.c: Use __gettimeofday, not gettimeofday. * sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sem_timedwait.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise.
2003-03-17 19:25:18 +08:00
{
int *futex = (int *) sem;
int err;
do
{
if (atomic_decrement_if_positive (futex) > 0)
return 0;
PowerPC port contributed by Paul Mackerras <paulus@samba.org>. * sysdeps/pthread/pthread_spin_init.c: New file. * sysdeps/pthread/pthread_spin_unlock.c: New file. * sysdeps/powerpc/Makefile: New file. * sysdeps/powerpc/pthread_spin_lock.c: New file. * sysdeps/powerpc/pthread_spin_trylock.c: New file. * sysdeps/powerpc/pthreaddef.h: New file. * sysdeps/powerpc/tcb-offsets.sym: New file. * sysdeps/powerpc/td_ta_map_lwp2thr.c: New file. * sysdeps/powerpc/tls.h: New file. * sysdeps/powerpc/bits/atomic.h: New file. * sysdeps/unix/sysv/linux/libc-lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/libc-lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/sem_post.c: New file. * sysdeps/unix/sysv/linux/sem_timedwait.c: New file. * sysdeps/unix/sysv/linux/sem_trywait.c: New file. * sysdeps/unix/sysv/linux/sem_wait.c: New file. * sysdeps/unix/sysv/linux/powerpc/Makefile: New file. * sysdeps/unix/sysv/linux/powerpc/createthread.c: New file. * sysdeps/unix/sysv/linux/powerpc/fork.c: New file. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file. * sysdeps/unix/sysv/linux/powerpc/pt-vfork.S: New file. * sysdeps/unix/sysv/linux/powerpc/pthread_once.c: New file. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/ia64/lowlevellock.c: Use __gettimeofday, not gettimeofday. * sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sem_timedwait.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise.
2003-03-17 19:25:18 +08:00
Update. 2003-06-07 Ulrich Drepper <drepper@redhat.com> * cleanup_routine.c: New file. * Versions (libpthread) [GLIBC_2.3.3]: Add __pthread_cleanup_routine. * sysdeps/pthread/pthread.h: Add support for fully exception-based cleanup handling. * Makefile (libpthread-routines): Add cleanup_routine. Add more CFLAGS variables to compile with exceptions. Add comments why which file needs unwind tables. (tests) [have-forced-unwind==yes]: Add tst-cancelx* and tst-cleanupx* tests. * tst-cancelx1.c: New file. * tst-cancelx2.c: New file. * tst-cancelx3.c: New file. * tst-cancelx4.c: New file. * tst-cancelx5.c: New file. * tst-cancelx6.c: New file. * tst-cancelx7.c: New file. * tst-cancelx8.c: New file. * tst-cancelx9.c: New file. * tst-cancelx10.c: New file. * tst-cancelx11.c: New file. * tst-cancelx12.c: New file. * tst-cancelx13.c: New file. * tst-cancelx14.c: New file. * tst-cancelx15.c: New file. * tst-cleanupx0.c: New file. * tst-cleanupx0.expect: New file. * tst-cleanupx1.c: New file. * tst-cleanupx2.c: New file. * tst-cleanupx3.c: New file. * tst-cleanup0.c: Make standard compliant. * tst-cleanup1.c: Likewise. * sysdeps/unix/sysv/linux/sem_timedwait.c: Add cancellation support. * sysdeps/unix/sysv/linux/sem_wait.c: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Likewise. * sysdeps/i386/tcb-offsets.sym: Add RESULT, CANCELHANDLING, and CLEANUP_JMP_BUF. * sysdeps/x86_64/tcb-offsets.sym: Likewise. * tst-cancel12.c: New file. * tst-cancel13.c: New file. * tst-cancel14.c: New file. * tst-cancel15.c: New file. * Makefile (tests): Add tst-cancel12, tst-cancel13, tst-cancel14, and tst-cancel15. * tst-cancel1.c: Add some comments. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Compute relative timeout correctly.
2003-06-08 13:28:14 +08:00
/* Enable asynchronous cancellation. Required by the standard. */
int oldtype = __pthread_enable_asynccancel ();
/* Always assume the semaphore is shared. */
err = lll_futex_wait (futex, 0, LLL_SHARED);
Update. 2003-06-07 Ulrich Drepper <drepper@redhat.com> * cleanup_routine.c: New file. * Versions (libpthread) [GLIBC_2.3.3]: Add __pthread_cleanup_routine. * sysdeps/pthread/pthread.h: Add support for fully exception-based cleanup handling. * Makefile (libpthread-routines): Add cleanup_routine. Add more CFLAGS variables to compile with exceptions. Add comments why which file needs unwind tables. (tests) [have-forced-unwind==yes]: Add tst-cancelx* and tst-cleanupx* tests. * tst-cancelx1.c: New file. * tst-cancelx2.c: New file. * tst-cancelx3.c: New file. * tst-cancelx4.c: New file. * tst-cancelx5.c: New file. * tst-cancelx6.c: New file. * tst-cancelx7.c: New file. * tst-cancelx8.c: New file. * tst-cancelx9.c: New file. * tst-cancelx10.c: New file. * tst-cancelx11.c: New file. * tst-cancelx12.c: New file. * tst-cancelx13.c: New file. * tst-cancelx14.c: New file. * tst-cancelx15.c: New file. * tst-cleanupx0.c: New file. * tst-cleanupx0.expect: New file. * tst-cleanupx1.c: New file. * tst-cleanupx2.c: New file. * tst-cleanupx3.c: New file. * tst-cleanup0.c: Make standard compliant. * tst-cleanup1.c: Likewise. * sysdeps/unix/sysv/linux/sem_timedwait.c: Add cancellation support. * sysdeps/unix/sysv/linux/sem_wait.c: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Likewise. * sysdeps/i386/tcb-offsets.sym: Add RESULT, CANCELHANDLING, and CLEANUP_JMP_BUF. * sysdeps/x86_64/tcb-offsets.sym: Likewise. * tst-cancel12.c: New file. * tst-cancel13.c: New file. * tst-cancel14.c: New file. * tst-cancel15.c: New file. * Makefile (tests): Add tst-cancel12, tst-cancel13, tst-cancel14, and tst-cancel15. * tst-cancel1.c: Add some comments. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Compute relative timeout correctly.
2003-06-08 13:28:14 +08:00
/* Disable asynchronous cancellation. */
__pthread_disable_asynccancel (oldtype);
PowerPC port contributed by Paul Mackerras <paulus@samba.org>. * sysdeps/pthread/pthread_spin_init.c: New file. * sysdeps/pthread/pthread_spin_unlock.c: New file. * sysdeps/powerpc/Makefile: New file. * sysdeps/powerpc/pthread_spin_lock.c: New file. * sysdeps/powerpc/pthread_spin_trylock.c: New file. * sysdeps/powerpc/pthreaddef.h: New file. * sysdeps/powerpc/tcb-offsets.sym: New file. * sysdeps/powerpc/td_ta_map_lwp2thr.c: New file. * sysdeps/powerpc/tls.h: New file. * sysdeps/powerpc/bits/atomic.h: New file. * sysdeps/unix/sysv/linux/libc-lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/libc-lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevellock.c: New file. * sysdeps/unix/sysv/linux/lowlevelmutex.c: New file. * sysdeps/unix/sysv/linux/sem_post.c: New file. * sysdeps/unix/sysv/linux/sem_timedwait.c: New file. * sysdeps/unix/sysv/linux/sem_trywait.c: New file. * sysdeps/unix/sysv/linux/sem_wait.c: New file. * sysdeps/unix/sysv/linux/powerpc/Makefile: New file. * sysdeps/unix/sysv/linux/powerpc/createthread.c: New file. * sysdeps/unix/sysv/linux/powerpc/fork.c: New file. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file. * sysdeps/unix/sysv/linux/powerpc/pt-vfork.S: New file. * sysdeps/unix/sysv/linux/powerpc/pthread_once.c: New file. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: New file. * sysdeps/unix/sysv/linux/ia64/lowlevellock.c: Use __gettimeofday, not gettimeofday. * sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sem_timedwait.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevelmutex.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise.
2003-03-17 19:25:18 +08:00
}
while (err == 0 || err == -EWOULDBLOCK);
__set_errno (-err);
return -1;
}
compat_symbol (libpthread, __old_sem_wait, sem_wait, GLIBC_2_0);
#endif
int
__new_sem_trywait (sem_t *sem)
{
/* We must not fail spuriously, so require a definitive result even if this
may lead to a long execution time. */
if (__new_sem_wait_fast ((struct new_sem *) sem, 1) == 0)
return 0;
__set_errno (EAGAIN);
return -1;
}
versioned_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1);
#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
int
__old_sem_trywait (sem_t *sem)
{
int *futex = (int *) sem;
int val;
if (*futex > 0)
{
val = atomic_decrement_if_positive (futex);
if (val > 0)
return 0;
}
__set_errno (EAGAIN);
return -1;
}
compat_symbol (libpthread, __old_sem_trywait, sem_trywait, GLIBC_2_0);
#endif