diff options
| author | Rich Felker <dalias@aerifal.cx> | 2015-03-02 17:46:22 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-03-02 17:46:22 -0500 |
| commit | 0fc317d83c1167393bf276a8bfbdd9a4e02e8258 (patch) | |
| tree | 8528b13bb7a68b2553ebab797e428283eee11a06 /src/internal/pthread_impl.h | |
| parent | 76ca7a5446a8aec2b671a401d5e1878c4704754e (diff) | |
| download | musl-0fc317d83c1167393bf276a8bfbdd9a4e02e8258.tar.gz | |
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/internal/pthread_impl.h')
| -rw-r--r-- | src/internal/pthread_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |