pthread: implement try/timed join variants

[musl] / src / thread / pthread_join.c

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index 5210ed4..5211148 100644 (file)
--- a/src/thread/pthread_join.c
+++ b/src/thread/pthread_join.c
@@ -1,12 +1,36 @@
 #include "pthread_impl.h"
+#include <sys/mman.h>
 
-int pthread_join(pthread_t t, void **res)
+int __munmap(void *, size_t);
+void __pthread_testcancel(void);
+int __pthread_setcancelstate(int, int *);
+
+int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
 {
-       int tmp = t->tid;
-       CANCELPT_BEGIN;
-       if (tmp) __wait(&t->tid, 0, tmp, 1);
-       CANCELPT_END;
+       int tmp, cs, r = 0;
+       __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);
+       __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);
+       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->tid ? 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);