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

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index 52111489..67eaf9d8 100644
--- a/src/thread/pthread_join.c
+++ b/src/thread/pthread_join.c
@@ -11,8 +11,9 @@ int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
 	__pthread_testcancel();
 	__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
 	if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
-	while ((tmp = t->tid) && r != ETIMEDOUT && r != EINVAL)
-		r = __timedwait_cp(&t->tid, tmp, CLOCK_REALTIME, at, 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();
@@ -28,7 +29,7 @@ int __pthread_join(pthread_t t, void **res)
 
 int __pthread_tryjoin_np(pthread_t t, void **res)
 {
-	return t->tid ? EBUSY : __pthread_join(t, res);
+	return t->join_futex ? EBUSY : __pthread_join(t, res);
 }
 
 weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np);