diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-03-17 20:41:37 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-03-17 20:41:37 -0400 |
| commit | 047e434ef5fd5437a74f98f63c40a77a683f7f3f (patch) | |
| tree | 30102ca55dc34c2b5ec078e3b3ab7891abcccb5f /src/thread/pthread_mutex_lock.c | |
| parent | 18c7ea8055cf733f168d2c74d7cc8523a360f5f1 (diff) | |
| download | musl-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_lock.c')
| -rw-r--r-- | src/thread/pthread_mutex_lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c index 56111ec8..477b3d80 100644 --- a/src/thread/pthread_mutex_lock.c +++ b/src/thread/pthread_mutex_lock.c @@ -4,9 +4,9 @@ int pthread_mutex_lock(pthread_mutex_t *m) { int r; while ((r=pthread_mutex_trylock(m)) == EBUSY) { - if (!(r=m->_m_lock)) continue; - if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK - && r == pthread_self()->tid) + if (!(r=m->_m_lock) || (r&0x40000000)) continue; + if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK + && (r&0x1fffffff) == pthread_self()->tid) return EDEADLK; __wait(&m->_m_lock, &m->_m_waiters, r, 0); } |