mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
e51deae7f6
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.
407 lines
11 KiB
C
407 lines
11 KiB
C
/* Copyright (C) 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
|
|
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 <errno.h>
|
|
#include <fcntl.h>
|
|
#include <mntent.h>
|
|
#include <paths.h>
|
|
#include <pthread.h>
|
|
#include <search.h>
|
|
#include <semaphore.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/statfs.h>
|
|
#include <linux_fsinfo.h>
|
|
#include "semaphoreP.h"
|
|
|
|
|
|
|
|
/* Information about the mount point. */
|
|
struct mountpoint_info mountpoint attribute_hidden;
|
|
|
|
/* This is the default mount point. */
|
|
static const char defaultmount[] = "/dev/shm";
|
|
/* This is the default directory. */
|
|
static const char defaultdir[] = "/dev/shm/sem.";
|
|
|
|
/* Protect the `mountpoint' variable above. */
|
|
pthread_once_t __namedsem_once attribute_hidden = PTHREAD_ONCE_INIT;
|
|
|
|
|
|
/* Determine where the shmfs is mounted (if at all). */
|
|
void
|
|
attribute_hidden
|
|
__where_is_shmfs (void)
|
|
{
|
|
char buf[512];
|
|
struct statfs f;
|
|
struct mntent resmem;
|
|
struct mntent *mp;
|
|
FILE *fp;
|
|
|
|
/* The canonical place is /dev/shm. This is at least what the
|
|
documentation tells everybody to do. */
|
|
if (__statfs (defaultmount, &f) == 0 && f.f_type == SHMFS_SUPER_MAGIC)
|
|
{
|
|
/* It is in the normal place. */
|
|
mountpoint.dir = (char *) defaultdir;
|
|
mountpoint.dirlen = sizeof (defaultdir) - 1;
|
|
|
|
return;
|
|
}
|
|
|
|
/* OK, do it the hard way. Look through the /proc/mounts file and if
|
|
this does not exist through /etc/fstab to find the mount point. */
|
|
fp = __setmntent ("/proc/mounts", "r");
|
|
if (__builtin_expect (fp == NULL, 0))
|
|
{
|
|
fp = __setmntent (_PATH_MNTTAB, "r");
|
|
if (__builtin_expect (fp == NULL, 0))
|
|
/* There is nothing we can do. Blind guesses are not helpful. */
|
|
return;
|
|
}
|
|
|
|
/* Now read the entries. */
|
|
while ((mp = __getmntent_r (fp, &resmem, buf, sizeof buf)) != NULL)
|
|
/* The original name is "shm" but this got changed in early Linux
|
|
2.4.x to "tmpfs". */
|
|
if (strcmp (mp->mnt_type, "tmpfs") == 0
|
|
|| strcmp (mp->mnt_type, "shm") == 0)
|
|
{
|
|
/* Found it. There might be more than one place where the
|
|
filesystem is mounted but one is enough for us. */
|
|
size_t namelen;
|
|
|
|
/* First make sure this really is the correct entry. At least
|
|
some versions of the kernel give wrong information because
|
|
of the implicit mount of the shmfs for SysV IPC. */
|
|
if (__statfs (mp->mnt_dir, &f) != 0 || f.f_type != SHMFS_SUPER_MAGIC)
|
|
continue;
|
|
|
|
namelen = strlen (mp->mnt_dir);
|
|
|
|
if (namelen == 0)
|
|
/* Hum, maybe some crippled entry. Keep on searching. */
|
|
continue;
|
|
|
|
mountpoint.dir = (char *) malloc (namelen + 4 + 2);
|
|
if (mountpoint.dir != NULL)
|
|
{
|
|
char *cp = __mempcpy (mountpoint.dir, mp->mnt_dir, namelen);
|
|
if (cp[-1] != '/')
|
|
*cp++ = '/';
|
|
cp = stpcpy (cp, "sem.");
|
|
mountpoint.dirlen = cp - mountpoint.dir;
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
/* Close the stream. */
|
|
__endmntent (fp);
|
|
}
|
|
|
|
|
|
/* Comparison function for search of existing mapping. */
|
|
int
|
|
attribute_hidden
|
|
__sem_search (const void *a, const void *b)
|
|
{
|
|
const struct inuse_sem *as = (const struct inuse_sem *) a;
|
|
const struct inuse_sem *bs = (const struct inuse_sem *) b;
|
|
|
|
if (as->ino != bs->ino)
|
|
/* Cannot return the difference the type is larger than int. */
|
|
return as->ino < bs->ino ? -1 : (as->ino == bs->ino ? 0 : 1);
|
|
|
|
if (as->dev != bs->dev)
|
|
/* Cannot return the difference the type is larger than int. */
|
|
return as->dev < bs->dev ? -1 : (as->dev == bs->dev ? 0 : 1);
|
|
|
|
return strcmp (as->name, bs->name);
|
|
}
|
|
|
|
|
|
/* The search tree for existing mappings. */
|
|
void *__sem_mappings attribute_hidden;
|
|
|
|
/* Lock to protect the search tree. */
|
|
int __sem_mappings_lock attribute_hidden = LLL_LOCK_INITIALIZER;
|
|
|
|
|
|
/* Search for existing mapping and if possible add the one provided. */
|
|
static sem_t *
|
|
check_add_mapping (const char *name, size_t namelen, int fd, sem_t *existing)
|
|
{
|
|
sem_t *result = SEM_FAILED;
|
|
|
|
/* Get the information about the file. */
|
|
struct stat64 st;
|
|
if (__fxstat64 (_STAT_VER, fd, &st) == 0)
|
|
{
|
|
/* Get the lock. */
|
|
lll_lock (__sem_mappings_lock, LLL_PRIVATE);
|
|
|
|
/* Search for an existing mapping given the information we have. */
|
|
struct inuse_sem *fake;
|
|
fake = (struct inuse_sem *) alloca (sizeof (*fake) + namelen);
|
|
memcpy (fake->name, name, namelen);
|
|
fake->dev = st.st_dev;
|
|
fake->ino = st.st_ino;
|
|
|
|
struct inuse_sem **foundp = tfind (fake, &__sem_mappings, __sem_search);
|
|
if (foundp != NULL)
|
|
{
|
|
/* There is already a mapping. Use it. */
|
|
result = (*foundp)->sem;
|
|
++(*foundp)->refcnt;
|
|
}
|
|
else
|
|
{
|
|
/* We haven't found a mapping. Install ione. */
|
|
struct inuse_sem *newp;
|
|
|
|
newp = (struct inuse_sem *) malloc (sizeof (*newp) + namelen);
|
|
if (newp != NULL)
|
|
{
|
|
/* If the caller hasn't provided any map it now. */
|
|
if (existing == SEM_FAILED)
|
|
existing = (sem_t *) mmap (NULL, sizeof (sem_t),
|
|
PROT_READ | PROT_WRITE, MAP_SHARED,
|
|
fd, 0);
|
|
|
|
newp->dev = st.st_dev;
|
|
newp->ino = st.st_ino;
|
|
newp->refcnt = 1;
|
|
newp->sem = existing;
|
|
memcpy (newp->name, name, namelen);
|
|
|
|
/* Insert the new value. */
|
|
if (existing != MAP_FAILED
|
|
&& tsearch (newp, &__sem_mappings, __sem_search) != NULL)
|
|
/* Successful. */
|
|
result = existing;
|
|
else
|
|
/* Something went wrong while inserting the new
|
|
value. We fail completely. */
|
|
free (newp);
|
|
}
|
|
}
|
|
|
|
/* Release the lock. */
|
|
lll_unlock (__sem_mappings_lock, LLL_PRIVATE);
|
|
}
|
|
|
|
if (result != existing && existing != SEM_FAILED && existing != MAP_FAILED)
|
|
{
|
|
/* Do not disturb errno. */
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
INTERNAL_SYSCALL (munmap, err, 2, existing, sizeof (sem_t));
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
sem_t *
|
|
sem_open (const char *name, int oflag, ...)
|
|
{
|
|
char *finalname;
|
|
sem_t *result = SEM_FAILED;
|
|
int fd;
|
|
|
|
/* Determine where the shmfs is mounted. */
|
|
INTUSE(__pthread_once) (&__namedsem_once, __where_is_shmfs);
|
|
|
|
/* If we don't know the mount points there is nothing we can do. Ever. */
|
|
if (mountpoint.dir == NULL)
|
|
{
|
|
__set_errno (ENOSYS);
|
|
return SEM_FAILED;
|
|
}
|
|
|
|
/* Construct the filename. */
|
|
while (name[0] == '/')
|
|
++name;
|
|
|
|
if (name[0] == '\0')
|
|
{
|
|
/* The name "/" is not supported. */
|
|
__set_errno (EINVAL);
|
|
return SEM_FAILED;
|
|
}
|
|
size_t namelen = strlen (name) + 1;
|
|
|
|
/* Create the name of the final file. */
|
|
finalname = (char *) alloca (mountpoint.dirlen + namelen);
|
|
__mempcpy (__mempcpy (finalname, mountpoint.dir, mountpoint.dirlen),
|
|
name, namelen);
|
|
|
|
/* If the semaphore object has to exist simply open it. */
|
|
if ((oflag & O_CREAT) == 0 || (oflag & O_EXCL) == 0)
|
|
{
|
|
try_again:
|
|
fd = __libc_open (finalname,
|
|
(oflag & ~(O_CREAT|O_ACCMODE)) | O_NOFOLLOW | O_RDWR);
|
|
|
|
if (fd == -1)
|
|
{
|
|
/* If we are supposed to create the file try this next. */
|
|
if ((oflag & O_CREAT) != 0 && errno == ENOENT)
|
|
goto try_create;
|
|
|
|
/* Return. errno is already set. */
|
|
}
|
|
else
|
|
/* Check whether we already have this semaphore mapped and
|
|
create one if necessary. */
|
|
result = check_add_mapping (name, namelen, fd, SEM_FAILED);
|
|
}
|
|
else
|
|
{
|
|
/* We have to open a temporary file first since it must have the
|
|
correct form before we can start using it. */
|
|
char *tmpfname;
|
|
mode_t mode;
|
|
unsigned int value;
|
|
va_list ap;
|
|
|
|
try_create:
|
|
va_start (ap, oflag);
|
|
|
|
mode = va_arg (ap, mode_t);
|
|
value = va_arg (ap, unsigned int);
|
|
|
|
va_end (ap);
|
|
|
|
if (value > SEM_VALUE_MAX)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return SEM_FAILED;
|
|
}
|
|
|
|
/* Create the initial file content. */
|
|
sem_t initsem;
|
|
|
|
struct new_sem *iinitsem = (struct new_sem *) &initsem;
|
|
iinitsem->value = value;
|
|
iinitsem->private = 0;
|
|
iinitsem->nwaiters = 0;
|
|
|
|
/* Initialize the remaining bytes as well. */
|
|
memset ((char *) &initsem + sizeof (struct new_sem), '\0',
|
|
sizeof (sem_t) - sizeof (struct new_sem));
|
|
|
|
tmpfname = (char *) alloca (mountpoint.dirlen + 6 + 1);
|
|
char *xxxxxx = __mempcpy (tmpfname, mountpoint.dir, mountpoint.dirlen);
|
|
|
|
int retries = 0;
|
|
#define NRETRIES 50
|
|
while (1)
|
|
{
|
|
/* Add the suffix for mktemp. */
|
|
strcpy (xxxxxx, "XXXXXX");
|
|
|
|
/* We really want to use mktemp here. We cannot use mkstemp
|
|
since the file must be opened with a specific mode. The
|
|
mode cannot later be set since then we cannot apply the
|
|
file create mask. */
|
|
if (mktemp (tmpfname) == NULL)
|
|
return SEM_FAILED;
|
|
|
|
/* Open the file. Make sure we do not overwrite anything. */
|
|
fd = __libc_open (tmpfname, O_RDWR | O_CREAT | O_EXCL, mode);
|
|
if (fd == -1)
|
|
{
|
|
if (errno == EEXIST)
|
|
{
|
|
if (++retries < NRETRIES)
|
|
continue;
|
|
|
|
__set_errno (EAGAIN);
|
|
}
|
|
|
|
return SEM_FAILED;
|
|
}
|
|
|
|
/* We got a file. */
|
|
break;
|
|
}
|
|
|
|
if (TEMP_FAILURE_RETRY (__libc_write (fd, &initsem, sizeof (sem_t)))
|
|
== sizeof (sem_t)
|
|
/* Map the sem_t structure from the file. */
|
|
&& (result = (sem_t *) mmap (NULL, sizeof (sem_t),
|
|
PROT_READ | PROT_WRITE, MAP_SHARED,
|
|
fd, 0)) != MAP_FAILED)
|
|
{
|
|
/* Create the file. Don't overwrite an existing file. */
|
|
if (link (tmpfname, finalname) != 0)
|
|
{
|
|
/* Undo the mapping. */
|
|
(void) munmap (result, sizeof (sem_t));
|
|
|
|
/* Reinitialize 'result'. */
|
|
result = SEM_FAILED;
|
|
|
|
/* This failed. If O_EXCL is not set and the problem was
|
|
that the file exists, try again. */
|
|
if ((oflag & O_EXCL) == 0 && errno == EEXIST)
|
|
{
|
|
/* Remove the file. */
|
|
(void) unlink (tmpfname);
|
|
|
|
/* Close the file. */
|
|
(void) __libc_close (fd);
|
|
|
|
goto try_again;
|
|
}
|
|
}
|
|
else
|
|
/* Insert the mapping into the search tree. This also
|
|
determines whether another thread sneaked by and already
|
|
added such a mapping despite the fact that we created it. */
|
|
result = check_add_mapping (name, namelen, fd, result);
|
|
}
|
|
|
|
/* Now remove the temporary name. This should never fail. If
|
|
it fails we leak a file name. Better fix the kernel. */
|
|
(void) unlink (tmpfname);
|
|
}
|
|
|
|
/* Map the mmap error to the error we need. */
|
|
if (MAP_FAILED != (void *) SEM_FAILED && result == MAP_FAILED)
|
|
result = SEM_FAILED;
|
|
|
|
/* We don't need the file descriptor anymore. */
|
|
if (fd != -1)
|
|
{
|
|
/* Do not disturb errno. */
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
INTERNAL_SYSCALL (close, err, 1, fd);
|
|
}
|
|
|
|
return result;
|
|
}
|