diff options
Diffstat (limited to 'src/thread/pthread_mutex_lock.c')
| -rw-r--r-- | src/thread/pthread_mutex_lock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c index 82556141..56111ec8 100644 --- a/src/thread/pthread_mutex_lock.c +++ b/src/thread/pthread_mutex_lock.c @@ -4,10 +4,11 @@ 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 - && m->_m_owner == pthread_self()->tid) + && r == pthread_self()->tid) return EDEADLK; - __wait(&m->_m_lock, &m->_m_waiters, 1, 0); + __wait(&m->_m_lock, &m->_m_waiters, r, 0); } return r; } |