X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_join.c;h=17dae85d7086155a78b89052b6f0b551429a2987;hb=760f5d7efed4d4761875334f8c4e6398be308cc9;hp=18264da6562cb2963271931e3df012d71cd60bfd;hpb=cdba6b2562bc5c2078e0e1e6f86c8835a42ae4ff;p=musl

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index 18264da6..17dae85d 100644
--- a/src/thread/pthread_join.c
+++ b/src/thread/pthread_join.c
@@ -1,11 +1,13 @@
+#define _GNU_SOURCE
 #include "pthread_impl.h"
 #include <sys/mman.h>
 
-int __munmap(void *, size_t);
-void __pthread_testcancel(void);
-int __pthread_setcancelstate(int, int *);
+static void dummy1(pthread_t t)
+{
+}
+weak_alias(dummy1, __tl_sync);
 
-int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
+static int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
 {
 	int state, cs, r = 0;
 	__pthread_testcancel();
@@ -13,11 +15,11 @@ int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
 	if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
 	while ((state = t->detach_state) && r != ETIMEDOUT && r != EINVAL) {
 		if (state >= DT_DETACHED) a_crash();
-		r = __timedwait_cp(&t->detach_state, state, CLOCK_REALTIME, at, 0);
+		r = __timedwait_cp(&t->detach_state, state, CLOCK_REALTIME, at, 1);
 	}
 	__pthread_setcancelstate(cs, 0);
 	if (r == ETIMEDOUT || r == EINVAL) return r;
-	a_barrier();
+	__tl_sync(t);
 	if (res) *res = t->result;
 	if (t->map_base) __munmap(t->map_base, t->map_size);
 	return 0;
@@ -28,7 +30,7 @@ int __pthread_join(pthread_t t, void **res)
 	return __pthread_timedjoin_np(t, res, 0);
 }
 
-int __pthread_tryjoin_np(pthread_t t, void **res)
+static int __pthread_tryjoin_np(pthread_t t, void **res)
 {
 	return t->detach_state==DT_JOINABLE ? EBUSY : __pthread_join(t, res);
 }