90dd591393
mq_notify (present in POSIX by 1996) brings in references to pthread_barrier_init and pthread_barrier_wait (new in the 2001 edition of POSIX). This patch fixes this by making those functions into weak aliases of __pthread_barrier_*, exporting the __pthread_barrier_* names at version GLIBC_PRIVATE and using them in mq_notify. Tested for x86_64 and x86 (testsuite, and comparison of installed stripped shared libraries). Changes in addresses from dynamic symbol table / PLT changes render most comparisons not particularly useful, but when the addresses of subsequent code don't change there's no sign of unexpected changes there. This patch does not remove any linknamespace XFAILs because of other namespace issues remaining with mqueue.h functions. [BZ #18544] * nptl/pthread_barrier_init.c (pthread_barrier_init): Rename to __pthread_barrier_init and define as weak alias of __pthread_barrier_init. * sysdeps/sparc/nptl/pthread_barrier_init.c (pthread_barrier_init): Likewise. * nptl/pthread_barrier_wait.c (pthread_barrier_wait): Rename to __pthread_barrier_wait and define as weak alias of __pthread_barrier_wait. * sysdeps/sparc/nptl/pthread_barrier_wait.c (pthread_barrier_wait): Likewise. * sysdeps/sparc/sparc32/pthread_barrier_wait.c (pthread_barrier_wait): Likewise. * sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S (pthread_barrier_wait): Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S (pthread_barrier_wait): Likewise. * nptl/Versions (libpthread): Export __pthread_barrier_init and __pthread_barrier_wait at version GLIBC_PRIVATE. * include/pthread.h (__pthread_barrier_init): Declare. (__pthread_barrier_wait): Likewise. * sysdeps/unix/sysv/linux/mq_notify.c (notification_function): Call __pthread_barrier_wait instead of pthread_barrier_wait. (helper_thread): Likewise. (init_mq_netlink): Call __pthread_barrier_init instead of pthread_barrier_init.
162 lines
3.7 KiB
ArmAsm
162 lines
3.7 KiB
ArmAsm
/* Copyright (C) 2002-2015 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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <sysdep.h>
|
|
#include <lowlevellock.h>
|
|
#include <lowlevelbarrier.h>
|
|
|
|
|
|
.text
|
|
|
|
.globl __pthread_barrier_wait
|
|
.type __pthread_barrier_wait,@function
|
|
.align 16
|
|
__pthread_barrier_wait:
|
|
/* Get the mutex. */
|
|
xorl %eax, %eax
|
|
movl $1, %esi
|
|
LOCK
|
|
cmpxchgl %esi, MUTEX(%rdi)
|
|
jnz 1f
|
|
|
|
/* One less waiter. If this was the last one needed wake
|
|
everybody. */
|
|
2: decl LEFT(%rdi)
|
|
je 3f
|
|
|
|
/* There are more threads to come. */
|
|
#if CURR_EVENT == 0
|
|
movl (%rdi), %edx
|
|
#else
|
|
movl CURR_EVENT(%rdi), %edx
|
|
#endif
|
|
|
|
/* Release the mutex. */
|
|
LOCK
|
|
decl MUTEX(%rdi)
|
|
jne 6f
|
|
|
|
/* Wait for the remaining threads. The call will return immediately
|
|
if the CURR_EVENT memory has meanwhile been changed. */
|
|
7:
|
|
#if FUTEX_WAIT == 0
|
|
movl PRIVATE(%rdi), %esi
|
|
#else
|
|
movl $FUTEX_WAIT, %esi
|
|
orl PRIVATE(%rdi), %esi
|
|
#endif
|
|
xorq %r10, %r10
|
|
8: movl $SYS_futex, %eax
|
|
syscall
|
|
|
|
/* Don't return on spurious wakeups. The syscall does not change
|
|
any register except %eax so there is no need to reload any of
|
|
them. */
|
|
#if CURR_EVENT == 0
|
|
cmpl %edx, (%rdi)
|
|
#else
|
|
cmpl %edx, CURR_EVENT(%rdi)
|
|
#endif
|
|
je 8b
|
|
|
|
/* Increment LEFT. If this brings the count back to the
|
|
initial count unlock the object. */
|
|
movl $1, %edx
|
|
movl INIT_COUNT(%rdi), %eax
|
|
LOCK
|
|
xaddl %edx, LEFT(%rdi)
|
|
subl $1, %eax
|
|
cmpl %eax, %edx
|
|
jne,pt 10f
|
|
|
|
/* Release the mutex. We cannot release the lock before
|
|
waking the waiting threads since otherwise a new thread might
|
|
arrive and gets waken up, too. */
|
|
LOCK
|
|
decl MUTEX(%rdi)
|
|
jne 9f
|
|
|
|
10: xorl %eax, %eax /* != PTHREAD_BARRIER_SERIAL_THREAD */
|
|
|
|
retq
|
|
|
|
/* The necessary number of threads arrived. */
|
|
3:
|
|
#if CURR_EVENT == 0
|
|
incl (%rdi)
|
|
#else
|
|
incl CURR_EVENT(%rdi)
|
|
#endif
|
|
|
|
/* Wake up all waiters. The count is a signed number in the kernel
|
|
so 0x7fffffff is the highest value. */
|
|
movl $0x7fffffff, %edx
|
|
movl $FUTEX_WAKE, %esi
|
|
orl PRIVATE(%rdi), %esi
|
|
movl $SYS_futex, %eax
|
|
syscall
|
|
|
|
/* Increment LEFT. If this brings the count back to the
|
|
initial count unlock the object. */
|
|
movl $1, %edx
|
|
movl INIT_COUNT(%rdi), %eax
|
|
LOCK
|
|
xaddl %edx, LEFT(%rdi)
|
|
subl $1, %eax
|
|
cmpl %eax, %edx
|
|
jne,pt 5f
|
|
|
|
/* Release the mutex. We cannot release the lock before
|
|
waking the waiting threads since otherwise a new thread might
|
|
arrive and gets waken up, too. */
|
|
LOCK
|
|
decl MUTEX(%rdi)
|
|
jne 4f
|
|
|
|
5: orl $-1, %eax /* == PTHREAD_BARRIER_SERIAL_THREAD */
|
|
|
|
retq
|
|
|
|
1: movl PRIVATE(%rdi), %esi
|
|
addq $MUTEX, %rdi
|
|
xorl $LLL_SHARED, %esi
|
|
callq __lll_lock_wait
|
|
subq $MUTEX, %rdi
|
|
jmp 2b
|
|
|
|
4: movl PRIVATE(%rdi), %esi
|
|
addq $MUTEX, %rdi
|
|
xorl $LLL_SHARED, %esi
|
|
callq __lll_unlock_wake
|
|
jmp 5b
|
|
|
|
6: movl PRIVATE(%rdi), %esi
|
|
addq $MUTEX, %rdi
|
|
xorl $LLL_SHARED, %esi
|
|
callq __lll_unlock_wake
|
|
subq $MUTEX, %rdi
|
|
jmp 7b
|
|
|
|
9: movl PRIVATE(%rdi), %esi
|
|
addq $MUTEX, %rdi
|
|
xorl $LLL_SHARED, %esi
|
|
callq __lll_unlock_wake
|
|
jmp 10b
|
|
.size __pthread_barrier_wait,.-__pthread_barrier_wait
|
|
weak_alias (__pthread_barrier_wait, pthread_barrier_wait)
|