X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_join.c;h=67eaf9d81de134bdd8c131bb015114ea5b1b4e4a;hb=4df42163511182bfd6fc55e85250b93786dcce7e;hp=b4ff33a5e0ebbf1ca00c7b4c0a94cf3934eb7d06;hpb=0fc317d83c1167393bf276a8bfbdd9a4e02e8258;p=musl

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index b4ff33a5..67eaf9d8 100644
--- a/src/thread/pthread_join.c
+++ b/src/thread/pthread_join.c
@@ -2,15 +2,36 @@
 #include <sys/mman.h>
 
 int __munmap(void *, size_t);
+void __pthread_testcancel(void);
+int __pthread_setcancelstate(int, int *);
 
-int __pthread_join(pthread_t t, void **res)
+int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
 {
-	int tmp;
-	pthread_testcancel();
-	while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0);
+	int tmp, cs, r = 0;
+	__pthread_testcancel();
+	__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
+	if (t->detached) a_crash();
+	while ((tmp = t->join_futex) && r != ETIMEDOUT && r != EINVAL)
+		r = __timedwait_cp(&t->join_futex, tmp, CLOCK_REALTIME, at, 0);
+	__pthread_setcancelstate(cs, 0);
+	if (r == ETIMEDOUT || r == EINVAL) return r;
+	a_barrier();
 	if (res) *res = t->result;
 	if (t->map_base) __munmap(t->map_base, t->map_size);
 	return 0;
 }
 
+int __pthread_join(pthread_t t, void **res)
+{
+	return __pthread_timedjoin_np(t, res, 0);
+}
+
+int __pthread_tryjoin_np(pthread_t t, void **res)
+{
+	return t->join_futex ? EBUSY : __pthread_join(t, res);
+}
+
+weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np);
+weak_alias(__pthread_timedjoin_np, pthread_timedjoin_np);
 weak_alias(__pthread_join, pthread_join);