#include "pthread_impl.h"
+#include <sys/mman.h>
-int pthread_join(pthread_t t, void **res)
+int __munmap(void *, size_t);
+
+static void dummy(void *p)
{
- int tmp = t->tid;
- CANCELPT_BEGIN;
- if (tmp) __wait(&t->tid, 0, tmp, 1);
- CANCELPT_END;
+}
+
+int __pthread_join(pthread_t t, void **res)
+{
+ int tmp;
+ pthread_testcancel();
+ while ((tmp = t->tid)) __timedwait(&t->tid, tmp, 0, 0, dummy, 0, 0);
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;
}
+
+weak_alias(__pthread_join, pthread_join);