X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_timedlock.c;h=f1c3eed74f0868561a5c3bc288ce798922b18700;hb=b2486a8922bf4977bd82c8190258e39de28c053b;hp=5dfad94ff1b7c56b1ebb1d70cf2187ffcad9284b;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c
index 5dfad94f..f1c3eed7 100644
--- a/src/thread/pthread_mutex_timedlock.c
+++ b/src/thread/pthread_mutex_timedlock.c
@@ -4,12 +4,13 @@ int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *at)
 {
 	int r, w=0;
 	while ((r=pthread_mutex_trylock(m)) == EBUSY) {
-		if (!w) a_inc(&m->__waiters), w++;
-		if (__timedwait(&m->__lock, 1, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
-			if (w) a_dec(&m->__waiters);
+		if (!(r=m->_m_lock) || (r&0x40000000)) continue;
+		if (!w) a_inc(&m->_m_waiters), w++;
+		if (__timedwait(&m->_m_lock, r, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
+			if (w) a_dec(&m->_m_waiters);
 			return ETIMEDOUT;
 		}
 	}
-	if (w) a_dec(&m->__waiters);
+	if (w) a_dec(&m->_m_waiters);
 	return r;
 }