From: Rich Felker Date: Thu, 15 Jan 2015 12:21:02 +0000 (-0500) Subject: suppress EINTR in sem_wait and sem_timedwait X-Git-Tag: v1.1.7~81 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c0ed5a201b2bdb6d1896064bec0020c9973db0a1;p=oweals%2Fmusl.git 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. --- 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; }