about summary refs log tree commit diff
path: root/nptl/Makefile
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-01-25 17:08:51 -0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-12-20 11:32:54 -0200
commit4735850f7a4f07f05ee9ff405238332f4bb3ab50 (patch)
treeb16aba7381f9bc06cc2a903a36bd9c7d647e845c /nptl/Makefile
parent8bfb461e20380dbc579f6dad4c54bb8a55afc82a (diff)
downloadglibc-4735850f7a4f07f05ee9ff405238332f4bb3ab50.tar.gz
glibc-4735850f7a4f07f05ee9ff405238332f4bb3ab50.tar.xz
glibc-4735850f7a4f07f05ee9ff405238332f4bb3ab50.zip
nptl: Consolidate pthread_{timed,try}join{_np}
This patch consolidates the pthread_join and gnu extensions to avoid
code duplication.  The function pthread_join, pthread_tryjoin_np, and
pthread_timedjoin_np are now based on pthread_timedjoin_ex.

It also fixes some inconsistencies on ESRCH, EINVAL, EDEADLK handling
(where each implementation differs from each other) and also on
clenup handler (which now always use a CAS).

Checked on i686-linux-gnu and x86_64-linux-gnu.

	* nptl/pthreadP.h (__pthread_timedjoin_np): Define.
	* nptl/pthread_join.c (pthread_join): Use __pthread_timedjoin_np.
	* nptl/pthread_tryjoin.c (pthread_tryjoin): Likewise.
	* nptl/pthread_timedjoin.c (cleanup): Use CAS on argument setting.
	(pthread_timedjoin_np): Define internal symbol and common code from
	pthread_join.
	* sysdeps/unix/sysv/linux/i386/lowlevellock.h (__lll_timedwait_tid):
	Remove superflous checks.
	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h (__lll_timedwait_tid):
	Likewise.

Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl/Makefile')
-rw-r--r--nptl/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index ab8cc98728..cf2ba8131b 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -49,6 +49,7 @@ pthread-compat-wrappers = \
 libpthread-routines = nptl-init vars events version pt-interp \
 		      pthread_create pthread_exit pthread_detach \
 		      pthread_join pthread_tryjoin pthread_timedjoin \
+		      pthread_join_common \
 		      compat-pthread_self pthread_equal pthread_yield \
 		      pthread_getconcurrency pthread_setconcurrency \
 		      pthread_getschedparam pthread_setschedparam \