2007-05-15 06:24:31 +00:00
|
|
|
/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
|
2003-03-11 06:52:08 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
|
|
|
|
|
|
|
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, write to the Free
|
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
|
02111-1307 USA. */
|
|
|
|
|
|
|
|
|
|
#include <sysdep.h>
|
* sysdeps/unix/sysv/linux/powerpc/sem_post.c (__new_sem_post):
Use __asm __volatile (__lll_acq_instr ::: "memory") instead of
atomic_full_barrier.
2007-07-31 Jakub Jelinek <jakub@redhat.com>
* allocatestack.c (stack_cache_lock): Change type to int.
(get_cached_stack, allocate_stack, __deallocate_stack,
__make_stacks_executable, __find_thread_by_id, __nptl_setxid,
__pthread_init_static_tls, __wait_lookup_done): Add LLL_PRIVATE
as second argument to lll_lock and lll_unlock macros on
stack_cache_lock.
* pthread_create.c (__find_in_stack_list): Likewise.
(start_thread): Similarly with pd->lock. Use lll_robust_dead
macro instead of lll_robust_mutex_dead, pass LLL_SHARED to it
as second argument.
* descr.h (struct pthread): Change lock and setxid_futex field
type to int.
* old_pthread_cond_broadcast.c (__pthread_cond_broadcast_2_0): Use
LLL_LOCK_INITIALIZER instead of LLL_MUTEX_LOCK_INITIALIZER.
* old_pthread_cond_signal.c (__pthread_cond_signal_2_0): Likewise.
* old_pthread_cond_timedwait.c (__pthread_cond_timedwait_2_0):
Likewise.
* old_pthread_cond_wait.c (__pthread_cond_wait_2_0): Likewise.
* pthread_cond_init.c (__pthread_cond_init): Likewise.
* pthreadP.h (__attr_list_lock): Change type to int.
* pthread_attr_init.c (__attr_list_lock): Likewise.
* pthread_barrier_destroy.c (pthread_barrier_destroy): Pass
ibarrier->private ^ FUTEX_PRIVATE_FLAG as second argument to
lll_{,un}lock.
* pthread_barrier_wait.c (pthread_barrier_wait): Likewise and
also for lll_futex_{wake,wait}.
* pthread_barrier_init.c (pthread_barrier_init): Make iattr
a pointer to const.
* pthread_cond_broadcast.c (__pthread_cond_broadcast): Pass
LLL_SHARED as second argument to lll_{,un}lock.
* pthread_cond_destroy.c (__pthread_cond_destroy): Likewise.
* pthread_cond_signal.c (__pthread_cond_singal): Likewise.
* pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise.
* pthread_cond_wait.c (__condvar_cleanup, __pthread_cond_wait):
Likewise.
* pthread_getattr_np.c (pthread_getattr_np): Add LLL_PRIVATE
as second argument to lll_{,un}lock macros on pd->lock.
* pthread_getschedparam.c (__pthread_getschedparam): Likewise.
* pthread_setschedparam.c (__pthread_setschedparam): Likewise.
* pthread_setschedprio.c (pthread_setschedprio): Likewise.
* tpp.c (__pthread_tpp_change_priority, __pthread_current_priority):
Likewise.
* sysdeps/pthread/createthread.c (do_clone, create_thread):
Likewise.
* pthread_once.c (once_lock): Change type to int.
(__pthread_once): Pass LLL_PRIVATE as second argument to
lll_{,un}lock macros on once_lock.
* pthread_rwlock_rdlock.c (__pthread_rwlock_rdlock): Use
lll_{,un}lock macros instead of lll_mutex_{,un}lock, pass
rwlock->__data.__shared as second argument to them and similarly
for lll_futex_w*.
* pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock):
Likewise.
* pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock):
Likewise.
* pthread_rwlock_tryrdlock.c (__pthread_rwlock_tryrdlock): Likewise.
* pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock): Likewise.
* pthread_rwlock_unlock.c (__pthread_rwlock_unlock): Likewise.
* pthread_rwlock_wrlock.c (__pthread_rwlock_wrlock): Likewise.
* sem_close.c (sem_close): Pass LLL_PRIVATE as second argument
to lll_{,un}lock macros on __sem_mappings_lock.
* sem_open.c (check_add_mapping): Likewise.
(__sem_mappings_lock): Change type to int.
* semaphoreP.h (__sem_mappings_lock): Likewise.
* pthread_mutex_lock.c (LLL_MUTEX_LOCK, LLL_MUTEX_TRYLOCK,
LLL_ROBUST_MUTEX_LOCK): Use lll_{,try,robust_}lock macros
instead of lll_*mutex_*, pass LLL_SHARED as last
argument.
(__pthread_mutex_lock): Use lll_unlock instead of lll_mutex_unlock,
pass LLL_SHARED as last argument.
* sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c (LLL_MUTEX_LOCK,
LLL_MUTEX_TRYLOCK, LLL_ROBUST_MUTEX_LOCK): Use
lll_{cond_,cond_try,robust_cond}lock macros instead of lll_*mutex_*,
pass LLL_SHARED as last argument.
* pthread_mutex_timedlock.c (pthread_mutex_timedlock): Use
lll_{timed,try,robust_timed,un}lock instead of lll_*mutex*, pass
LLL_SHARED as last argument.
* pthread_mutex_trylock.c (__pthread_mutex_trylock): Similarly.
* pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
Similarly.
* sysdeps/pthread/bits/libc-lock.h (__libc_lock_lock,
__libc_lock_lock_recursive, __libc_lock_unlock,
__libc_lock_unlock_recursive): Pass LLL_PRIVATE as second
argument to lll_{,un}lock.
* sysdeps/pthread/bits/stdio-lock.h (_IO_lock_lock,
_IO_lock_unlock): Likewise.
* sysdeps/unix/sysv/linux/fork.c (__libc_fork): Don't use
compound literal.
* sysdeps/unix/sysv/linux/unregister-atfork.c (__unregister_atfork):
Pass LLL_PRIVATE as second argument to lll_{,un}lock macros on
__fork_lock.
* sysdeps/unix/sysv/linux/register-atfork.c (__register_atfork,
free_mem): Likewise.
(__fork_lock): Change type to int.
* sysdeps/unix/sysv/linux/fork.h (__fork_lock): Likewise.
* sysdeps/unix/sysv/linux/sem_post.c (__new_sem_post): Pass
isem->private ^ FUTEX_PRIVATE_FLAG as second argument to
lll_futex_wake.
* sysdeps/unix/sysv/linux/sem_timedwait.c (sem_timedwait): Likewise.
* sysdeps/unix/sysv/linux/sem_wait.c (__new_sem_wait): Likewise.
* sysdeps/unix/sysv/linux/lowlevellock.c (__lll_lock_wait_private):
New function.
(__lll_lock_wait, __lll_timedlock_wait): Add private argument and
pass it through to lll_futex_*wait, only compile in when
IS_IN_libpthread.
* sysdeps/unix/sysv/linux/lowlevelrobustlock.c
(__lll_robust_lock_wait, __lll_robust_timedlock_wait): Add private
argument and pass it through to lll_futex_*wait.
* sysdeps/unix/sysv/linux/alpha/lowlevellock.h: Renamed all
lll_mutex_* resp. lll_robust_mutex_* macros to lll_* resp.
lll_robust_*. Renamed all __lll_mutex_* resp. __lll_robust_mutex_*
inline functions to __lll_* resp. __lll_robust_*.
(LLL_MUTEX_LOCK_INITIALIZER): Remove.
(lll_mutex_dead): Add private argument.
(__lll_lock_wait_private): New prototype.
(__lll_lock_wait, __lll_robust_lock_wait, __lll_lock_timedwait,
__lll_robust_lock_timedwait): Add private argument to prototypes.
(__lll_lock): Add private argument, if it is constant LLL_PRIVATE,
call __lll_lock_wait_private, otherwise pass private to
__lll_lock_wait.
(__lll_robust_lock, __lll_cond_lock, __lll_timedlock,
__lll_robust_timedlock): Add private argument, pass it to
__lll_*wait functions.
(__lll_unlock): Add private argument, if it is constant LLL_PRIVATE,
call __lll_unlock_wake_private, otherwise pass private to
__lll_unlock_wake.
(__lll_robust_unlock): Add private argument, pass it to
__lll_robust_unlock_wake.
(lll_lock, lll_robust_lock, lll_cond_lock, lll_timedlock,
lll_robust_timedlock, lll_unlock, lll_robust_unlock): Add private
argument, pass it through to __lll_* inline function.
(__lll_mutex_unlock_force, lll_mutex_unlock_force): Remove.
(lll_lock_t): Remove.
(__lll_cond_wait, __lll_cond_timedwait, __lll_cond_wake,
__lll_cond_broadcast, lll_cond_wait, lll_cond_timedwait,
lll_cond_wake, lll_cond_broadcast): Remove.
* sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/i386/lowlevellock.h: Allow including
the header from assembler. Renamed all lll_mutex_* resp.
lll_robust_mutex_* macros to lll_* resp. lll_robust_*.
(LOCK, FUTEX_CMP_REQUEUE, FUTEX_WAKE_OP,
FUTEX_OP_CLEAR_WAKE_IF_GT_ONE): Define.
(LLL_MUTEX_LOCK_INITIALIZER, LLL_MUTEX_LOCK_INITIALIZER_LOCKED,
LLL_MUTEX_LOCK_INITIALIZER_WAITERS): Remove.
(__lll_mutex_lock_wait, __lll_mutex_timedlock_wait,
__lll_mutex_unlock_wake, __lll_lock_wait, __lll_unlock_wake):
Remove prototype.
(__lll_trylock_asm, __lll_lock_asm_start, __lll_unlock_asm): Define.
(lll_robust_trylock, lll_cond_trylock): Use LLL_LOCK_INITIALIZER*
rather than LLL_MUTEX_LOCK_INITIALIZER* macros.
(lll_trylock): Likewise, use __lll_trylock_asm, pass
MULTIPLE_THREADS_OFFSET as another asm operand.
(lll_lock): Add private argument, use __lll_lock_asm_start, pass
MULTIPLE_THREADS_OFFSET as last asm operand, call
__lll_lock_wait_private if private is constant LLL_PRIVATE,
otherwise pass private as another argument to __lll_lock_wait.
(lll_robust_lock, lll_cond_lock, lll_robust_cond_lock,
lll_timedlock, lll_robust_timedlock): Add private argument, pass
private as another argument to __lll_*lock_wait call.
(lll_unlock): Add private argument, use __lll_unlock_asm, pass
MULTIPLE_THREADS_OFFSET as another asm operand, call
__lll_unlock_wake_private if private is constant LLL_PRIVATE,
otherwise pass private as another argument to __lll_unlock_wake.
(lll_robust_unlock): Add private argument, pass private as another
argument to __lll_unlock_wake.
(lll_robust_dead): Add private argument, use __lll_private_flag
macro.
(lll_islocked): Use LLL_LOCK_INITIALIZER instead of
LLL_MUTEX_LOCK_INITIALIZER.
(lll_lock_t): Remove.
(LLL_LOCK_INITIALIZER_WAITERS): Define.
(__lll_cond_wait, __lll_cond_timedwait, __lll_cond_wake,
__lll_cond_broadcast, lll_cond_wait, lll_cond_timedwait,
lll_cond_wake, lll_cond_broadcast): Remove.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Revert
2007-05-2{3,9} changes.
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Include
kernel-features.h and lowlevellock.h.
(LOAD_PRIVATE_FUTEX_WAIT): Define.
(LOAD_FUTEX_WAIT): Rewritten.
(LOCK, SYS_gettimeofday, SYS_futex, FUTEX_WAIT, FUTEX_WAKE): Don't
define.
(__lll_lock_wait_private, __lll_unlock_wake_private): New functions.
(__lll_mutex_lock_wait): Rename to ...
(__lll_lock_wait): ... this. Take futex addr from %edx instead of
%ecx, %ecx is now private argument. Don't compile in for libc.so.
(__lll_mutex_timedlock_wait): Rename to ...
(__lll_timedlock_wait): ... this. Use __NR_gettimeofday. %esi
contains private argument. Don't compile in for libc.so.
(__lll_mutex_unlock_wake): Rename to ...
(__lll_unlock_wake): ... this. %ecx contains private argument.
Don't compile in for libc.so.
(__lll_timedwait_tid): Use __NR_gettimeofday.
* sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Include
kernel-features.h and lowlevellock.h.
(LOAD_FUTEX_WAIT): Define.
(LOCK, SYS_gettimeofday, SYS_futex, FUTEX_WAIT, FUTEX_WAKE): Don't
define.
(__lll_robust_mutex_lock_wait): Rename to ...
(__lll_robust_lock_wait): ... this. Futex addr is now in %edx
argument, %ecx argument contains private. Use LOAD_FUTEX_WAIT
macro.
(__lll_robust_mutex_timedlock_wait): Rename to ...
(__lll_robust_timedlock_wait): ... this. Use __NR_gettimeofday.
%esi argument contains private, use LOAD_FUTEX_WAIT macro.
* sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S: Include
lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, LOCK): Don't define.
(pthread_barrier_wait): Rename __lll_mutex_* to __lll_*, pass
PRIVATE(%ebx) ^ LLL_SHARED as private argument in %ecx to
__lll_lock_wait and __lll_unlock_wake, pass MUTEX(%ebx) address
to __lll_lock_wait in %edx.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S:
Include lowlevellock.h and pthread-errnos.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_REQUEUE,
FUTEX_CMP_REQUEUE, EINVAL, LOCK): Don't define.
(__pthread_cond_broadcast): Rename __lll_mutex_* to __lll_*, pass
cond_lock address in %edx rather than %ecx to __lll_lock_wait,
pass LLL_SHARED in %ecx to both __lll_lock_wait and
__lll_unlock_wake.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S:
Include lowlevellock.h and pthread-errnos.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_WAKE_OP,
FUTEX_OP_CLEAR_WAKE_IF_GT_ONE, EINVAL, LOCK): Don't define.
(__pthread_cond_signal): Rename __lll_mutex_* to __lll_*, pass
cond_lock address in %edx rather than %ecx to __lll_lock_wait,
pass LLL_SHARED in %ecx to both __lll_lock_wait and
__lll_unlock_wake.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S:
Include lowlevellock.h.
(SYS_futex, SYS_gettimeofday, FUTEX_WAIT, FUTEX_WAKE, LOCK):
Don't define.
(__pthread_cond_timedwait): Rename __lll_mutex_* to __lll_*, pass
cond_lock address in %edx rather than %ecx to __lll_lock_wait,
pass LLL_SHARED in %ecx to both __lll_lock_wait and
__lll_unlock_wake. Use __NR_gettimeofday.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, LOCK): Don't define.
(__pthread_cond_wait, __condvar_w_cleanup): Rename __lll_mutex_*
to __lll_*, pass cond_lock address in %edx rather than %ecx to
__lll_lock_wait, pass LLL_SHARED in %ecx to both __lll_lock_wait
and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, LOCK): Don't define.
(__pthread_rwlock_rdlock): Rename __lll_mutex_* to __lll_*, pass
MUTEX(%ebx) address in %edx rather than %ecx to
__lll_lock_wait, pass PSHARED(%ebx) in %ecx to both __lll_lock_wait
and __lll_unlock_wake. Move return value from %ecx to %edx
register.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S:
Include lowlevellock.h.
(SYS_futex, SYS_gettimeofday, FUTEX_WAIT, FUTEX_WAKE, LOCK):
Don't define.
(__pthread_rwlock_wrlock): Rename __lll_mutex_* to __lll_*, pass
MUTEX(%ebp) address in %edx rather than %ecx to
__lll_lock_wait, pass PSHARED(%ebp) in %ecx to both __lll_lock_wait
and __lll_unlock_wake. Move return value from %ecx to %edx
register. Use __NR_gettimeofday.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S:
Include lowlevellock.h.
(SYS_futex, SYS_gettimeofday, FUTEX_WAIT, FUTEX_WAKE, LOCK):
Don't define.
(__pthread_rwlock_wrlock): Rename __lll_mutex_* to __lll_*, pass
MUTEX(%ebp) address in %edx rather than %ecx to
__lll_lock_wait, pass PSHARED(%ebp) in %ecx to both __lll_lock_wait
and __lll_unlock_wake. Move return value from %ecx to %edx
register. Use __NR_gettimeofday.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, LOCK): Don't define.
(__pthread_rwlock_unlock): Rename __lll_mutex_* to __lll_*, pass
MUTEX(%edi) address in %edx rather than %ecx to
__lll_lock_wait, pass PSHARED(%edi) in %ecx to both __lll_lock_wait
and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, LOCK): Don't define.
(__pthread_rwlock_wrlock): Rename __lll_mutex_* to __lll_*, pass
MUTEX(%ebx) address in %edx rather than %ecx to
__lll_lock_wait, pass PSHARED(%ebx) in %ecx to both __lll_lock_wait
and __lll_unlock_wake. Move return value from %ecx to %edx
register.
* sysdeps/unix/sysv/linux/i386/pthread_once.S: Include
lowlevellock.h.
(LOCK, SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG): Don't
define.
* sysdeps/unix/sysv/linux/i386/i486/sem_post.S: Include lowlevellock.h.
(LOCK, SYS_futex, FUTEX_WAKE): Don't define.
* sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S: Include
lowlevellock.h.
(LOCK, SYS_futex, SYS_gettimeofday, FUTEX_WAIT): Don't define.
(sem_timedwait): Use __NR_gettimeofday.
* sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S: Include
lowlevellock.h.
(LOCK): Don't define.
* sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: Include
lowlevellock.h.
(LOCK, SYS_futex, FUTEX_WAIT): Don't define.
* sysdeps/unix/sysv/linux/powerpc/sem_post.c: Wake only when there
are waiters.
* sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S: Revert
2007-05-2{3,9} changes.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Include
kernel-features.h and lowlevellock.h.
(LOAD_PRIVATE_FUTEX_WAIT): Define.
(LOAD_FUTEX_WAIT): Rewritten.
(LOCK, SYS_futex, FUTEX_WAIT, FUTEX_WAKE): Don't define.
(__lll_lock_wait_private, __lll_unlock_wake_private): New functions.
(__lll_mutex_lock_wait): Rename to ...
(__lll_lock_wait): ... this. %esi is now private argument.
Don't compile in for libc.so.
(__lll_mutex_timedlock_wait): Rename to ...
(__lll_timedlock_wait): ... this. %esi contains private argument.
Don't compile in for libc.so.
(__lll_mutex_unlock_wake): Rename to ...
(__lll_unlock_wake): ... this. %esi contains private argument.
Don't compile in for libc.so.
* sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: Include
kernel-features.h and lowlevellock.h.
(LOAD_FUTEX_WAIT): Define.
(LOCK, SYS_futex, FUTEX_WAIT, FUTEX_WAKE): Don't define.
(__lll_robust_mutex_lock_wait): Rename to ...
(__lll_robust_lock_wait): ... this. %esi argument contains private.
Use LOAD_FUTEX_WAIT macro.
(__lll_robust_mutex_timedlock_wait): Rename to ...
(__lll_robust_timedlock_wait): ... this. %esi argument contains
private, use LOAD_FUTEX_WAIT macro.
* sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S: Include
lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, LOCK): Don't define.
(pthread_barrier_wait): Rename __lll_mutex_* to __lll_*, pass
PRIVATE(%rdi) ^ LLL_SHARED as private argument in %esi to
__lll_lock_wait and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S:
Include lowlevellock.h and pthread-errnos.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_REQUEUE,
FUTEX_CMP_REQUEUE, EINVAL, LOCK): Don't define.
(__pthread_cond_broadcast): Rename __lll_mutex_* to __lll_*,
pass LLL_SHARED in %esi to both __lll_lock_wait and
__lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S:
Include lowlevellock.h and pthread-errnos.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_WAKE_OP,
FUTEX_OP_CLEAR_WAKE_IF_GT_ONE, EINVAL, LOCK): Don't define.
(__pthread_cond_signal): Rename __lll_mutex_* to __lll_*,
pass LLL_SHARED in %esi to both __lll_lock_wait and
__lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, LOCK): Don't define.
(__pthread_cond_timedwait): Rename __lll_mutex_* to __lll_*,
pass LLL_SHARED in %esi to both __lll_lock_wait and
__lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, LOCK): Don't define.
(__pthread_cond_wait, __condvar_cleanup): Rename __lll_mutex_*
to __lll_*, pass LLL_SHARED in %esi to both __lll_lock_wait
and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG, LOCK):
Don't define.
(__pthread_rwlock_rdlock): Rename __lll_mutex_* to __lll_*,
pass PSHARED(%rdi) in %esi to both __lll_lock_wait
and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG, LOCK):
Don't define.
(__pthread_rwlock_wrlock): Rename __lll_mutex_* to __lll_*,
pass PSHARED(%rdi) in %esi to both __lll_lock_wait
and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG, LOCK):
Don't define.
(__pthread_rwlock_wrlock): Rename __lll_mutex_* to __lll_*,
pass PSHARED(%rdi) in %esi to both __lll_lock_wait
and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG, LOCK):
Don't define.
(__pthread_rwlock_unlock): Rename __lll_mutex_* to __lll_*,
pass PSHARED(%rdi) in %esi to both __lll_lock_wait
and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S:
Include lowlevellock.h.
(SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG, LOCK):
Don't define.
(__pthread_rwlock_wrlock): Rename __lll_mutex_* to __lll_*,
pass PSHARED(%rdi) in %ecx to both __lll_lock_wait
and __lll_unlock_wake.
* sysdeps/unix/sysv/linux/x86_64/pthread_once.S: Include
lowlevellock.h.
(LOCK, SYS_futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_PRIVATE_FLAG): Don't
define.
* sysdeps/unix/sysv/linux/x86_64/sem_post.S: Include lowlevellock.h.
(LOCK, SYS_futex, FUTEX_WAKE): Don't define.
* sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Include
lowlevellock.h.
(LOCK, SYS_futex, FUTEX_WAIT): Don't define.
* sysdeps/unix/sysv/linux/x86_64/sem_trywait.S: Include
lowlevellock.h.
(LOCK): Don't define.
* sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Include
lowlevellock.h.
(LOCK, SYS_futex, FUTEX_WAIT): Don't define.
* sysdeps/unix/sysv/linux/sparc/internaltypes.h: New file.
* sysdeps/unix/sysv/linux/sparc/pthread_barrier_destroy.c: New file.
* sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c: New file.
* sysdeps/unix/sysv/linux/sparc/pthread_barrier_wait.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
(__lll_lock_wait_private): New function.
(__lll_lock_wait, __lll_timedlock_wait): Add private argument, pass
it to lll_futex_*wait. Don't compile in for libc.so.
* sysdeps/unix/sysv/linux/sparc/sparc32/pthread_barrier_init.c:
Remove.
* sysdeps/unix/sysv/linux/sparc/sparc32/pthread_barrier_wait.c
(struct sparc_pthread_barrier): Remove.
(pthread_barrier_wait): Use union sparc_pthread_barrier instead of
struct sparc_pthread_barrier. Pass
ibarrier->s.pshared ? LLL_SHARED : LLL_PRIVATE to lll_{,un}lock
and lll_futex_wait macros.
* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_init.c:
Remove.
* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c:
Include sparc pthread_barrier_wait.c instead of generic one.
2007-08-01 04:47:26 +00:00
|
|
|
#include <lowlevellock.h>
|
2003-03-11 06:52:08 +00:00
|
|
|
#include <shlib-compat.h>
|
2003-03-12 10:28:07 +00:00
|
|
|
#include <pthread-errnos.h>
|
2007-05-26 01:31:40 +00:00
|
|
|
#include <structsem.h>
|
2003-03-11 06:52:08 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
.text
|
|
|
|
|
|
2003-03-13 01:51:12 +00:00
|
|
|
.globl sem_wait
|
|
|
|
|
.type sem_wait,@function
|
2003-03-11 06:52:08 +00:00
|
|
|
.align 16
|
2003-03-13 01:51:12 +00:00
|
|
|
sem_wait:
|
2007-05-26 01:31:40 +00:00
|
|
|
.LSTARTCODE:
|
2003-06-08 05:28:14 +00:00
|
|
|
pushq %r12
|
2007-05-26 01:31:40 +00:00
|
|
|
.Lpush_r12:
|
2003-06-08 05:28:14 +00:00
|
|
|
pushq %r13
|
2007-05-26 01:31:40 +00:00
|
|
|
.Lpush_r13:
|
2003-06-08 05:28:14 +00:00
|
|
|
movq %rdi, %r13
|
|
|
|
|
|
2007-05-26 01:31:40 +00:00
|
|
|
#if VALUE == 0
|
|
|
|
|
movl (%r13), %eax
|
|
|
|
|
#else
|
|
|
|
|
movl VALUE(%r13), %eax
|
|
|
|
|
#endif
|
2003-03-11 06:52:08 +00:00
|
|
|
2: testl %eax, %eax
|
|
|
|
|
je 1f
|
|
|
|
|
|
2007-05-26 01:31:40 +00:00
|
|
|
leal -1(%rax), %edx
|
2003-03-11 06:52:08 +00:00
|
|
|
LOCK
|
2007-05-26 01:31:40 +00:00
|
|
|
#if VALUE == 0
|
2003-06-08 05:28:14 +00:00
|
|
|
cmpxchgl %edx, (%r13)
|
2007-05-26 01:31:40 +00:00
|
|
|
#else
|
|
|
|
|
cmpxchgl %edx, VALUE(%r13)
|
|
|
|
|
#endif
|
2003-03-11 06:52:08 +00:00
|
|
|
jne 2b
|
|
|
|
|
|
2007-05-26 01:31:40 +00:00
|
|
|
7: xorl %eax, %eax
|
|
|
|
|
|
|
|
|
|
9: popq %r13
|
|
|
|
|
.Lpop_r13:
|
2003-06-08 05:28:14 +00:00
|
|
|
popq %r12
|
2007-05-26 01:31:40 +00:00
|
|
|
.Lpop_r12:
|
2003-06-08 05:28:14 +00:00
|
|
|
|
2003-03-11 06:52:08 +00:00
|
|
|
retq
|
|
|
|
|
|
2007-05-26 01:31:40 +00:00
|
|
|
.Lafter_retq:
|
|
|
|
|
1: LOCK
|
|
|
|
|
addq $1, NWAITERS(%r13)
|
|
|
|
|
|
|
|
|
|
.LcleanupSTART:
|
|
|
|
|
6: call __pthread_enable_asynccancel
|
2003-06-08 05:28:14 +00:00
|
|
|
movl %eax, %r8d
|
|
|
|
|
|
|
|
|
|
xorq %r10, %r10
|
2005-03-31 10:02:53 +00:00
|
|
|
movl $SYS_futex, %eax
|
2003-06-08 05:28:14 +00:00
|
|
|
movq %r13, %rdi
|
2007-05-26 04:49:06 +00:00
|
|
|
#if FUTEX_WAIT == 0
|
|
|
|
|
movl PRIVATE(%rdi), %esi
|
|
|
|
|
#else
|
2007-05-26 01:31:40 +00:00
|
|
|
movl $FUTEX_WAIT, %esi
|
2007-05-26 04:49:06 +00:00
|
|
|
orl PRIVATE(%rdi), %esi
|
|
|
|
|
#endif
|
2007-05-26 01:31:40 +00:00
|
|
|
xorl %edx, %edx
|
2003-03-11 06:52:08 +00:00
|
|
|
syscall
|
2003-06-08 05:28:14 +00:00
|
|
|
movq %rax, %r12
|
|
|
|
|
|
|
|
|
|
movl %r8d, %edi
|
|
|
|
|
call __pthread_disable_asynccancel
|
2007-05-26 01:31:40 +00:00
|
|
|
.LcleanupEND:
|
2003-03-11 06:52:08 +00:00
|
|
|
|
2003-06-08 05:28:14 +00:00
|
|
|
testq %r12, %r12
|
2007-05-26 01:31:40 +00:00
|
|
|
je 3f
|
2003-06-08 05:28:14 +00:00
|
|
|
cmpq $-EWOULDBLOCK, %r12
|
2007-05-26 01:31:40 +00:00
|
|
|
jne 4f
|
|
|
|
|
|
|
|
|
|
3:
|
|
|
|
|
#if VALUE == 0
|
|
|
|
|
movl (%r13), %eax
|
|
|
|
|
#else
|
|
|
|
|
movl VALUE(%r13), %eax
|
|
|
|
|
#endif
|
|
|
|
|
5: testl %eax, %eax
|
|
|
|
|
je 6b
|
|
|
|
|
|
|
|
|
|
leal -1(%rax), %edx
|
|
|
|
|
LOCK
|
|
|
|
|
#if VALUE == 0
|
|
|
|
|
cmpxchgl %edx, (%r13)
|
|
|
|
|
#else
|
|
|
|
|
cmpxchgl %edx, VALUE(%r13)
|
|
|
|
|
#endif
|
|
|
|
|
jne 5b
|
|
|
|
|
|
|
|
|
|
LOCK
|
|
|
|
|
subq $1, NWAITERS(%r13)
|
|
|
|
|
jmp 7b
|
|
|
|
|
|
|
|
|
|
4: negq %r12
|
2003-03-11 06:52:08 +00:00
|
|
|
#if USE___THREAD
|
|
|
|
|
movq errno@gottpoff(%rip), %rdx
|
2003-06-08 05:28:14 +00:00
|
|
|
movl %r12d, %fs:(%rdx)
|
2003-03-11 06:52:08 +00:00
|
|
|
#else
|
2003-03-11 19:40:00 +00:00
|
|
|
callq __errno_location@plt
|
2003-06-08 05:28:14 +00:00
|
|
|
movl %r12d, (%rax)
|
2003-03-11 06:52:08 +00:00
|
|
|
#endif
|
|
|
|
|
orl $-1, %eax
|
2003-06-08 05:28:14 +00:00
|
|
|
|
2007-05-26 01:31:40 +00:00
|
|
|
LOCK
|
|
|
|
|
subq $1, NWAITERS(%r13)
|
2003-06-08 05:28:14 +00:00
|
|
|
|
2007-05-26 01:31:40 +00:00
|
|
|
jmp 9b
|
2003-03-13 01:51:12 +00:00
|
|
|
.size sem_wait,.-sem_wait
|
2007-05-26 01:31:40 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
.type sem_wait_cleanup,@function
|
|
|
|
|
sem_wait_cleanup:
|
|
|
|
|
LOCK
|
|
|
|
|
subq $1, NWAITERS(%r13)
|
|
|
|
|
movq %rax, %rdi
|
|
|
|
|
.LcallUR:
|
|
|
|
|
call _Unwind_Resume@PLT
|
|
|
|
|
hlt
|
|
|
|
|
.LENDCODE:
|
|
|
|
|
.size sem_wait_cleanup,.-sem_wait_cleanup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.section .gcc_except_table,"a",@progbits
|
|
|
|
|
.LexceptSTART:
|
|
|
|
|
.byte 0xff # @LPStart format (omit)
|
|
|
|
|
.byte 0xff # @TType format (omit)
|
|
|
|
|
.byte 0x01 # call-site format
|
|
|
|
|
# DW_EH_PE_uleb128
|
|
|
|
|
.uleb128 .Lcstend-.Lcstbegin
|
|
|
|
|
.Lcstbegin:
|
|
|
|
|
.uleb128 .LcleanupSTART-.LSTARTCODE
|
|
|
|
|
.uleb128 .LcleanupEND-.LcleanupSTART
|
|
|
|
|
.uleb128 sem_wait_cleanup-.LSTARTCODE
|
|
|
|
|
.uleb128 0
|
|
|
|
|
.uleb128 .LcallUR-.LSTARTCODE
|
|
|
|
|
.uleb128 .LENDCODE-.LcallUR
|
|
|
|
|
.uleb128 0
|
|
|
|
|
.uleb128 0
|
|
|
|
|
.Lcstend:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.section .eh_frame,"a",@progbits
|
|
|
|
|
.LSTARTFRAME:
|
|
|
|
|
.long .LENDCIE-.LSTARTCIE # Length of the CIE.
|
|
|
|
|
.LSTARTCIE:
|
|
|
|
|
.long 0 # CIE ID.
|
|
|
|
|
.byte 1 # Version number.
|
|
|
|
|
#ifdef SHARED
|
|
|
|
|
.string "zPLR" # NUL-terminated augmentation
|
|
|
|
|
# string.
|
|
|
|
|
#else
|
|
|
|
|
.string "zPL" # NUL-terminated augmentation
|
|
|
|
|
# string.
|
|
|
|
|
#endif
|
|
|
|
|
.uleb128 1 # Code alignment factor.
|
|
|
|
|
.sleb128 -8 # Data alignment factor.
|
|
|
|
|
.byte 16 # Return address register
|
|
|
|
|
# column.
|
|
|
|
|
#ifdef SHARED
|
|
|
|
|
.uleb128 7 # Augmentation value length.
|
|
|
|
|
.byte 0x9b # Personality: DW_EH_PE_pcrel
|
|
|
|
|
# + DW_EH_PE_sdata4
|
|
|
|
|
# + DW_EH_PE_indirect
|
|
|
|
|
.long DW.ref.__gcc_personality_v0-.
|
|
|
|
|
.byte 0x1b # LSDA Encoding: DW_EH_PE_pcrel
|
|
|
|
|
# + DW_EH_PE_sdata4.
|
|
|
|
|
.byte 0x1b # FDE Encoding: DW_EH_PE_pcrel
|
|
|
|
|
# + DW_EH_PE_sdata4.
|
|
|
|
|
#else
|
|
|
|
|
.uleb128 10 # Augmentation value length.
|
|
|
|
|
.byte 0x0 # Personality: absolute
|
|
|
|
|
.quad __gcc_personality_v0
|
|
|
|
|
.byte 0x0 # LSDA Encoding: absolute
|
|
|
|
|
#endif
|
|
|
|
|
.byte 0x0c # DW_CFA_def_cfa
|
|
|
|
|
.uleb128 7
|
|
|
|
|
.uleb128 8
|
|
|
|
|
.byte 0x90 # DW_CFA_offset, column 0x10
|
|
|
|
|
.uleb128 1
|
|
|
|
|
.align 8
|
|
|
|
|
.LENDCIE:
|
|
|
|
|
|
|
|
|
|
.long .LENDFDE-.LSTARTFDE # Length of the FDE.
|
|
|
|
|
.LSTARTFDE:
|
|
|
|
|
.long .LSTARTFDE-.LSTARTFRAME # CIE pointer.
|
|
|
|
|
#ifdef SHARED
|
|
|
|
|
.long .LSTARTCODE-. # PC-relative start address
|
|
|
|
|
# of the code.
|
|
|
|
|
.long .LENDCODE-.LSTARTCODE # Length of the code.
|
|
|
|
|
.uleb128 4 # Augmentation size
|
|
|
|
|
.long .LexceptSTART-.
|
|
|
|
|
#else
|
|
|
|
|
.quad .LSTARTCODE # Start address of the code.
|
|
|
|
|
.quad .LENDCODE-.LSTARTCODE # Length of the code.
|
|
|
|
|
.uleb128 8 # Augmentation size
|
|
|
|
|
.quad .LexceptSTART
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
.byte 4 # DW_CFA_advance_loc4
|
|
|
|
|
.long .Lpush_r12-.LSTARTCODE
|
|
|
|
|
.byte 14 # DW_CFA_def_cfa_offset
|
|
|
|
|
.uleb128 16
|
|
|
|
|
.byte 0x8c # DW_CFA_offset %r12
|
|
|
|
|
.uleb128 2
|
|
|
|
|
.byte 4 # DW_CFA_advance_loc4
|
|
|
|
|
.long .Lpush_r13-.Lpush_r12
|
|
|
|
|
.byte 14 # DW_CFA_def_cfa_offset
|
|
|
|
|
.uleb128 24
|
|
|
|
|
.byte 0x8d # DW_CFA_offset %r13
|
|
|
|
|
.uleb128 3
|
|
|
|
|
.byte 4 # DW_CFA_advance_loc4
|
|
|
|
|
.long .Lpop_r13-.Lpush_r13
|
|
|
|
|
.byte 14 # DW_CFA_def_cfa_offset
|
|
|
|
|
.uleb128 16
|
|
|
|
|
.byte 0xcd # DW_CFA_restore %r13
|
|
|
|
|
.byte 4 # DW_CFA_advance_loc4
|
|
|
|
|
.long .Lpop_r12-.Lpop_r13
|
|
|
|
|
.byte 14 # DW_CFA_def_cfa_offset
|
|
|
|
|
.uleb128 8
|
|
|
|
|
.byte 0xcc # DW_CFA_restore %r12
|
|
|
|
|
.byte 4 # DW_CFA_advance_loc4
|
|
|
|
|
.long .Lafter_retq-.Lpop_r12
|
|
|
|
|
.byte 14 # DW_CFA_def_cfa_offset
|
|
|
|
|
.uleb128 24
|
|
|
|
|
.byte 0x8c # DW_CFA_offset %r12
|
|
|
|
|
.uleb128 2
|
|
|
|
|
.byte 0x8d # DW_CFA_offset %r13
|
|
|
|
|
.uleb128 3
|
|
|
|
|
.align 8
|
|
|
|
|
.LENDFDE:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SHARED
|
|
|
|
|
.hidden DW.ref.__gcc_personality_v0
|
|
|
|
|
.weak DW.ref.__gcc_personality_v0
|
|
|
|
|
.section .gnu.linkonce.d.DW.ref.__gcc_personality_v0,"aw",@progbits
|
|
|
|
|
.align 8
|
|
|
|
|
.type DW.ref.__gcc_personality_v0, @object
|
|
|
|
|
.size DW.ref.__gcc_personality_v0, 8
|
|
|
|
|
DW.ref.__gcc_personality_v0:
|
|
|
|
|
.quad __gcc_personality_v0
|
|
|
|
|
#endif
|