about summary refs log tree commit diff
path: root/src/thread/pthread_mutex_timedlock.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-17 20:41:37 -0400
committerRich Felker <dalias@aerifal.cx>2011-03-17 20:41:37 -0400
commit047e434ef5fd5437a74f98f63c40a77a683f7f3f (patch)
tree30102ca55dc34c2b5ec078e3b3ab7891abcccb5f /src/thread/pthread_mutex_timedlock.c
parent18c7ea8055cf733f168d2c74d7cc8523a360f5f1 (diff)
downloadmusl-047e434ef5fd5437a74f98f63c40a77a683f7f3f.tar.gz
musl-047e434ef5fd5437a74f98f63c40a77a683f7f3f.tar.xz
musl-047e434ef5fd5437a74f98f63c40a77a683f7f3f.zip
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.
Diffstat (limited to 'src/thread/pthread_mutex_timedlock.c')
-rw-r--r--src/thread/pthread_mutex_timedlock.c3
1 files changed, 2 insertions, 1 deletions
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;
 		}