path: root/src/thread/pthread_join.c
diff options
authorRich Felker <>2015-03-02 17:46:22 -0500
committerRich Felker <>2015-03-02 17:46:22 -0500
commit0fc317d83c1167393bf276a8bfbdd9a4e02e8258 (patch)
tree8528b13bb7a68b2553ebab797e428283eee11a06 /src/thread/pthread_join.c
parent76ca7a5446a8aec2b671a401d5e1878c4704754e (diff)
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.
Diffstat (limited to 'src/thread/pthread_join.c')
1 files changed, 1 insertions, 5 deletions
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;
- 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;