From ec381af90208a5675183202cf05078eac208edfb Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 2 Aug 2011 21:11:36 -0400 Subject: unify and overhaul timed futex waits new features: - FUTEX_WAIT_BITSET op will be used for timed waits if available. this saves a call to clock_gettime. - error checking for the timespec struct is now inside __timedwait so it doesn't need to be duplicated everywhere. cond_timedwait still needs to duplicate it to avoid unlocking the mutex, though. - pushing and popping the cancellation handler is delegated to __timedwait, and cancellable/non-cancellable waits are unified. --- src/thread/pthread_join.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/thread/pthread_join.c') diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c index ba7bb7d5..664abda9 100644 --- a/src/thread/pthread_join.c +++ b/src/thread/pthread_join.c @@ -1,9 +1,13 @@ #include "pthread_impl.h" +static void dummy(void *p) +{ +} + int pthread_join(pthread_t t, void **res) { int tmp = t->tid; - if (tmp) __timedwait_cp(&t->tid, tmp, 0, 0, 1); + if (tmp) __timedwait(&t->tid, tmp, 0, 0, dummy, 0, 1); if (res) *res = t->result; if (t->map_base) munmap(t->map_base, t->map_size); return 0; -- cgit v1.2.1