OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mq_notify pthread_barrier_* namespace (bug 18544). 

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.
This commit is contained in:
Joseph Myers 2015-06-17 20:16:56 +00:00
parent 45dcd79f6e
commit 90dd591393
12 changed files with 62 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@ -1,5 +1,32 @@
2015-06-17 Joseph Myers <joseph@codesourcery.com> 2015-06-17 Joseph Myers <joseph@codesourcery.com>
[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.
[BZ #18542] [BZ #18542]
* libio/iovswscanf.c (__vswscanf): Use libc_hidden_def. * libio/iovswscanf.c (__vswscanf): Use libc_hidden_def.
(vswscanf): Use ldbl_weak_alias instead of ldbl_strong_alias (vswscanf): Use ldbl_weak_alias instead of ldbl_strong_alias

2
NEWS
View File

@ -22,7 +22,7 @@ Version 2.22
18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434, 18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434,
18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498, 18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498,
18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532, 18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532,
18533, 18534, 18536, 18539, 18540, 18542. 18533, 18534, 18536, 18539, 18540, 18542, 18544.
* Cache information can be queried via sysconf() function on s390 e.g. with * Cache information can be queried via sysconf() function on s390 e.g. with
_SC_LEVEL1_ICACHE_SIZE as argument. _SC_LEVEL1_ICACHE_SIZE as argument.

10
include/pthread.h
View File

@ -1,6 +1,16 @@
#include_next <pthread.h> #include_next <pthread.h>
#ifndef _ISOMAC #ifndef _ISOMAC
/* Prototypes repeated instead of using __typeof because pthread.h is
included in C++ tests, and declaring functions with __typeof and
__THROW doesn't work for C++. */
extern int __pthread_barrier_init (pthread_barrier_t *__restrict __barrier,
const pthread_barrierattr_t *__restrict
__attr, unsigned int __count)
__THROW __nonnull ((1));
extern int __pthread_barrier_wait (pthread_barrier_t *__barrier)
__THROWNL __nonnull ((1));
/* This function is called to initialize the pthread library. */ /* This function is called to initialize the pthread library. */
extern void __pthread_initialize (void) __attribute__ ((weak)); extern void __pthread_initialize (void) __attribute__ ((weak));
#endif #endif

1
nptl/Versions
View File

@ -273,6 +273,7 @@ libpthread {
__pthread_initialize_minimal; __pthread_initialize_minimal;
__pthread_clock_gettime; __pthread_clock_settime; __pthread_clock_gettime; __pthread_clock_settime;
__pthread_unwind; __pthread_get_minstack; __pthread_unwind; __pthread_get_minstack;
__pthread_barrier_init; __pthread_barrier_wait;
__shm_directory; __shm_directory;
} }
} }

3
nptl/pthread_barrier_init.c
View File

@ -29,7 +29,7 @@ static const struct pthread_barrierattr default_barrierattr =
int int
pthread_barrier_init (barrier, attr, count) __pthread_barrier_init (barrier, attr, count)
pthread_barrier_t *barrier; pthread_barrier_t *barrier;
const pthread_barrierattr_t *attr; const pthread_barrierattr_t *attr;
unsigned int count; unsigned int count;
@ -68,3 +68,4 @@ pthread_barrier_init (barrier, attr, count)
return 0; return 0;
} }
weak_alias (__pthread_barrier_init, pthread_barrier_init)

3
nptl/pthread_barrier_wait.c
View File

@ -24,7 +24,7 @@
/* Wait on barrier. */ /* Wait on barrier. */
int int
pthread_barrier_wait (barrier) __pthread_barrier_wait (barrier)
pthread_barrier_t *barrier; pthread_barrier_t *barrier;
{ {
struct pthread_barrier *ibarrier = (struct pthread_barrier *) barrier; struct pthread_barrier *ibarrier = (struct pthread_barrier *) barrier;
@ -76,3 +76,4 @@ pthread_barrier_wait (barrier)
return result; return result;
} }
weak_alias (__pthread_barrier_wait, pthread_barrier_wait)

3
sysdeps/sparc/nptl/pthread_barrier_init.c
View File

@ -22,7 +22,7 @@
#include <sparc-nptl.h> #include <sparc-nptl.h>
int int
pthread_barrier_init (barrier, attr, count) __pthread_barrier_init (barrier, attr, count)
pthread_barrier_t *barrier; pthread_barrier_t *barrier;
const pthread_barrierattr_t *attr; const pthread_barrierattr_t *attr;
unsigned int count; unsigned int count;
@ -53,3 +53,4 @@ pthread_barrier_init (barrier, attr, count)
return 0; return 0;
} }
weak_alias (__pthread_barrier_init, pthread_barrier_init)

3
sysdeps/sparc/nptl/pthread_barrier_wait.c
View File

@ -24,7 +24,7 @@
/* Wait on barrier. */ /* Wait on barrier. */
int int
pthread_barrier_wait (barrier) __pthread_barrier_wait (barrier)
pthread_barrier_t *barrier; pthread_barrier_t *barrier;
{ {
union sparc_pthread_barrier *ibarrier union sparc_pthread_barrier *ibarrier
@ -76,3 +76,4 @@ pthread_barrier_wait (barrier)
return result; return result;
} }
weak_alias (__pthread_barrier_wait, pthread_barrier_wait)

3
sysdeps/sparc/sparc32/pthread_barrier_wait.c
View File

@ -24,7 +24,7 @@
/* Wait on barrier. */ /* Wait on barrier. */
int int
pthread_barrier_wait (barrier) __pthread_barrier_wait (barrier)
pthread_barrier_t *barrier; pthread_barrier_t *barrier;
{ {
union sparc_pthread_barrier *ibarrier union sparc_pthread_barrier *ibarrier
@ -92,3 +92,4 @@ pthread_barrier_wait (barrier)
return result; return result;
} }
weak_alias (__pthread_barrier_wait, pthread_barrier_wait)

9
sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
View File

@ -22,10 +22,10 @@
.text .text
.globl pthread_barrier_wait .globl __pthread_barrier_wait
.type pthread_barrier_wait,@function .type __pthread_barrier_wait,@function
.align 16 .align 16
pthread_barrier_wait: __pthread_barrier_wait:
cfi_startproc cfi_startproc
pushl %ebx pushl %ebx
cfi_adjust_cfa_offset(4) cfi_adjust_cfa_offset(4)
@ -183,4 +183,5 @@ pthread_barrier_wait:
call __lll_unlock_wake call __lll_unlock_wake
jmp 10b jmp 10b
cfi_endproc cfi_endproc
.size pthread_barrier_wait,.-pthread_barrier_wait .size __pthread_barrier_wait,.-__pthread_barrier_wait
weak_alias (__pthread_barrier_wait, pthread_barrier_wait)

6
sysdeps/unix/sysv/linux/mq_notify.c
View File

@ -92,7 +92,7 @@ notification_function (void *arg)
union sigval param = data->param; union sigval param = data->param;
/* Let the parent go. */ /* Let the parent go. */
(void) pthread_barrier_wait (&notify_barrier); (void) __pthread_barrier_wait (&notify_barrier);
/* Make the thread detached. */ /* Make the thread detached. */
(void) pthread_detach (pthread_self ()); (void) pthread_detach (pthread_self ());
@ -132,7 +132,7 @@ helper_thread (void *arg)
== 0, 0)) == 0, 0))
/* Since we passed a pointer to DATA to the new thread we have /* Since we passed a pointer to DATA to the new thread we have
to wait until it is done with it. */ to wait until it is done with it. */
(void) pthread_barrier_wait (&notify_barrier); (void) __pthread_barrier_wait (&notify_barrier);
} }
else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED)
/* The only state we keep is the copy of the thread attributes. */ /* The only state we keep is the copy of the thread attributes. */
@ -166,7 +166,7 @@ init_mq_netlink (void)
int err = 1; int err = 1;
/* Initialize the barrier. */ /* Initialize the barrier. */
if (__builtin_expect (pthread_barrier_init (&notify_barrier, NULL, 2) == 0, if (__builtin_expect (__pthread_barrier_init (&notify_barrier, NULL, 2) == 0,
0)) 0))
{ {
/* Create the helper thread. */ /* Create the helper thread. */

9
sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
View File

@ -23,10 +23,10 @@
.text .text
.globl pthread_barrier_wait .globl __pthread_barrier_wait
.type pthread_barrier_wait,@function .type __pthread_barrier_wait,@function
.align 16 .align 16
pthread_barrier_wait: __pthread_barrier_wait:
/* Get the mutex. */ /* Get the mutex. */
xorl %eax, %eax xorl %eax, %eax
movl $1, %esi movl $1, %esi
@ -157,4 +157,5 @@ pthread_barrier_wait:
xorl $LLL_SHARED, %esi xorl $LLL_SHARED, %esi
callq __lll_unlock_wake callq __lll_unlock_wake
jmp 10b jmp 10b
.size pthread_barrier_wait,.-pthread_barrier_wait .size __pthread_barrier_wait,.-__pthread_barrier_wait
weak_alias (__pthread_barrier_wait, pthread_barrier_wait)