From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 2 Mar 2015 23:11:28 +0000 (-0500)
Subject: make aio_suspend a cancellation point and properly handle cancellation
X-Git-Tag: v1.1.7~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5451d95715e3b4b37a32b54695fd1efa2cf3d9da;p=oweals%2Fmusl.git

make aio_suspend a cancellation point and properly handle cancellation
---

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