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/aio/aio_suspend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/aio') 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 break; } - 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; -- cgit v1.2.1