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/internal/pthread_impl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/internal') diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index ae6e60b5..7e7baa90 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -107,7 +107,8 @@ int __libc_sigprocmask(int, const sigset_t *, sigset_t *); void __lock(volatile int *); void __unmapself(void *, size_t); -int __timedwait(volatile int *, int, clockid_t, const struct timespec *, void (*)(void *), void *, int); +int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int); +int __timedwait_cp(volatile int *, int, clockid_t, const struct timespec *, int); void __wait(volatile int *, volatile int *, int, int); static inline void __wake(volatile void *addr, int cnt, int priv) { -- cgit 1.4.1