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/__timedwait.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'src/thread/__timedwait.c') diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c index 9b882b5a..13d8465a 100644 --- a/src/thread/__timedwait.c +++ b/src/thread/__timedwait.c @@ -3,15 +3,15 @@ #include #include "futex.h" #include "syscall.h" +#include "pthread_impl.h" int __pthread_setcancelstate(int, int *); int __clock_gettime(clockid_t, struct timespec *); -int __timedwait(volatile int *addr, int val, - clockid_t clk, const struct timespec *at, - void (*cleanup)(void *), void *arg, int priv) +int __timedwait_cp(volatile int *addr, int val, + clockid_t clk, const struct timespec *at, int priv) { - int r, cs; + int r; struct timespec to, *top=0; if (priv) priv = 128; @@ -28,15 +28,19 @@ int __timedwait(volatile int *addr, int val, top = &to; } - if (!cleanup) __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); - pthread_cleanup_push(cleanup, arg); - r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT|priv, val, top); if (r == ENOSYS) r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT, val, top); if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0; - pthread_cleanup_pop(0); - if (!cleanup) __pthread_setcancelstate(cs, 0); + return r; +} +int __timedwait(volatile int *addr, int val, + clockid_t clk, const struct timespec *at, int priv) +{ + int cs, r; + __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); + r = __timedwait_cp(addr, val, clk, at, priv); + __pthread_setcancelstate(cs, 0); return r; } -- cgit 1.4.1