+#define _GNU_SOURCE
#include "pthread_impl.h"
#include <sys/mman.h>
-int __munmap(void *, size_t);
-void __pthread_testcancel(void);
-int __pthread_setcancelstate(int, int *);
+static void dummy1(pthread_t t)
+{
+}
+weak_alias(dummy1, __tl_sync);
-int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
+static int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
{
int state, cs, r = 0;
__pthread_testcancel();
if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
while ((state = t->detach_state) && r != ETIMEDOUT && r != EINVAL) {
if (state >= DT_DETACHED) a_crash();
- r = __timedwait_cp(&t->detach_state, state, CLOCK_REALTIME, at, 0);
+ r = __timedwait_cp(&t->detach_state, state, CLOCK_REALTIME, at, 1);
}
__pthread_setcancelstate(cs, 0);
if (r == ETIMEDOUT || r == EINVAL) return r;
- a_barrier();
+ __tl_sync(t);
if (res) *res = t->result;
if (t->map_base) __munmap(t->map_base, t->map_size);
return 0;
return __pthread_timedjoin_np(t, res, 0);
}
-int __pthread_tryjoin_np(pthread_t t, void **res)
+static int __pthread_tryjoin_np(pthread_t t, void **res)
{
return t->detach_state==DT_JOINABLE ? EBUSY : __pthread_join(t, res);
}