fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-21 02:31:50 +00:00
Code Issues Projects Releases Wiki Activity

make aio_suspend a cancellation point and properly handle cancellation

Browse Source
This commit is contained in:
Rich Felker
2015-03-02 18:11:28 -05:00
parent 0fc317d83c
commit 5451d95715
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/aio/aio_suspend.c
View File

@ -15,6 +15,8 @@ int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec
int nzcnt = 0; int nzcnt = 0;
const struct aiocb *cb = 0; const struct aiocb *cb = 0;
pthread_testcancel();
if (cnt<0) { if (cnt<0) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
@ -61,10 +63,14 @@ int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec
break; break;
} }
ret = __timedwait(pfut, expect, CLOCK_MONOTONIC, ts?&at:0, 1); ret = __timedwait_cp(pfut, expect, CLOCK_MONOTONIC, ts?&at:0, 1);
if (ret) { switch (ret) {
errno = ret==ETIMEDOUT ? EAGAIN : ret; case ETIMEDOUT:
ret = EAGAIN;
case ECANCELED:
case EINTR:
errno = ret;
return -1; return -1;
} }
} }