path: root/src/aio/aio_suspend.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/aio/aio_suspend.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/aio/aio_suspend.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/aio/aio_suspend.c b/src/aio/aio_suspend.c
index 2391d786..dfa524bf 100644
--- a/src/aio/aio_suspend.c
+++ b/src/aio/aio_suspend.c
@@ -61,7 +61,7 @@ int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec
- ret = __timedwait(pfut, expect, CLOCK_MONOTONIC, ts?&at:0, 0, 0, 1);
+ ret = __timedwait(pfut, expect, CLOCK_MONOTONIC, ts?&at:0, 1);
if (ret) {
errno = ret==ETIMEDOUT ? EAGAIN : ret;