remove incorrect ESRCH error from pthread_kill

[musl] / src / thread / pthread_join.c

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index 5211148..67eaf9d 100644 (file)
--- 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);