From cc832d8a31e674c3d8ee7168e4a613b5bf8124e0 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 16 Mar 2011 11:35:46 -0400 Subject: don't expose EAGAIN, etc. from timed futex wait to caller --- src/thread/__timedwait.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c index 354def2c..988eb70d 100644 --- a/src/thread/__timedwait.c +++ b/src/thread/__timedwait.c @@ -6,6 +6,7 @@ #include int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, int priv) { + int r; struct timespec to; if (at) { clock_gettime(clk, &to); @@ -17,5 +18,7 @@ int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespe if (to.tv_sec < 0) return ETIMEDOUT; } if (priv) priv = 128; priv=0; - return syscall4(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0); + r = syscall4(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0); + if (r == ETIMEDOUT) return r; + return 0; } -- cgit v1.2.1