From 047e434ef5fd5437a74f98f63c40a77a683f7f3f Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 17 Mar 2011 20:41:37 -0400 Subject: implement robust mutexes some of this code should be cleaned up, e.g. using macros for some of the bit flags, masks, etc. nonetheless, the code is believed to be working and correct at this point. --- src/thread/pthread_mutex_timedlock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/thread/pthread_mutex_timedlock.c') diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c index 20ce0128..f1c3eed7 100644 --- a/src/thread/pthread_mutex_timedlock.c +++ b/src/thread/pthread_mutex_timedlock.c @@ -4,8 +4,9 @@ int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *at) { int r, w=0; while ((r=pthread_mutex_trylock(m)) == EBUSY) { + if (!(r=m->_m_lock) || (r&0x40000000)) continue; if (!w) a_inc(&m->_m_waiters), w++; - if (__timedwait(&m->_m_lock, 1, CLOCK_REALTIME, at, 0) == ETIMEDOUT) { + if (__timedwait(&m->_m_lock, r, CLOCK_REALTIME, at, 0) == ETIMEDOUT) { if (w) a_dec(&m->_m_waiters); return ETIMEDOUT; } -- cgit v1.2.1