From 0fc317d83c1167393bf276a8bfbdd9a4e02e8258 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 2 Mar 2015 17:46:22 -0500 Subject: factor cancellation cleanup push/pop out of futex __timedwait function previously, the __timedwait function was optionally a cancellation point depending on whether it was passed a pointer to a cleaup function and context to register. as of now, only one caller actually used such a cleanup function (and it may face removal soon); most callers either passed a null pointer to disable cancellation or a dummy cleanup function. now, __timedwait is never a cancellation point, and __timedwait_cp is the cancellable version. this makes the intent of the calling code more obvious and avoids ugly dummy functions and long argument lists. --- src/thread/pthread_join.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/thread/pthread_join.c') diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c index 19e6b548..b4ff33a5 100644 --- a/src/thread/pthread_join.c +++ b/src/thread/pthread_join.c @@ -3,15 +3,11 @@ int __munmap(void *, size_t); -static void dummy(void *p) -{ -} - 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); + while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0); if (res) *res = t->result; if (t->map_base) __munmap(t->map_base, t->map_size); return 0; -- cgit v1.2.1