path: root/src/thread/sem_timedwait.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/sem_timedwait.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/sem_timedwait.c')
1 files changed, 3 insertions, 2 deletions
diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index 288991d4..a7488df7 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -19,8 +19,9 @@ int sem_timedwait(sem_t *restrict sem, const struct timespec *restrict at)
int r;
a_cas(sem->__val, 0, -1);
- r = __timedwait(sem->__val, -1, CLOCK_REALTIME, at, cleanup, sem->__val+1, sem->__val[2]);
- a_dec(sem->__val+1);
+ pthread_cleanup_push(cleanup, sem->__val+1);
+ r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, sem->__val[2]);
+ pthread_cleanup_pop(1);
if (r && r != EINTR) {
errno = r;
return -1;