about summary refs log tree commit diff
path: root/src/thread/sem_timedwait.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-01-15 07:21:02 -0500
committerRich Felker <dalias@aerifal.cx>2015-01-15 07:21:02 -0500
commitc0ed5a201b2bdb6d1896064bec0020c9973db0a1 (patch)
tree92f25e8fb049de1f2cb9acc3742583aa092638e0 /src/thread/sem_timedwait.c
parent472e8b71f7a90ab23f1499fd721b872541f52de9 (diff)
downloadmusl-c0ed5a201b2bdb6d1896064bec0020c9973db0a1.tar.gz
musl-c0ed5a201b2bdb6d1896064bec0020c9973db0a1.tar.xz
musl-c0ed5a201b2bdb6d1896064bec0020c9973db0a1.zip
suppress EINTR in sem_wait and sem_timedwait
per POSIX, the EINTR condition is an optional error for these
functions, not a mandatory one. since old kernels (pre-2.6.22) failed
to honor SA_RESTART for the futex syscall, it's dangerous to trust
EINTR from the kernel. thankfully POSIX offers an easy way out.
Diffstat (limited to 'src/thread/sem_timedwait.c')
-rw-r--r--src/thread/sem_timedwait.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index 68dcb504..288991d4 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -21,7 +21,7 @@ int sem_timedwait(sem_t *restrict sem, const struct timespec *restrict at)
 		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);
-		if (r) {
+		if (r && r != EINTR) {
 			errno = r;
 			return -1;
 		}