summaryrefslogtreecommitdiff
path: root/src/thread/pthread_mutex_lock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/thread/pthread_mutex_lock.c')
-rw-r--r--src/thread/pthread_mutex_lock.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c
index 15ede3f5..82556141 100644
--- a/src/thread/pthread_mutex_lock.c
+++ b/src/thread/pthread_mutex_lock.c
@@ -3,7 +3,11 @@
int pthread_mutex_lock(pthread_mutex_t *m)
{
int r;
- while ((r=pthread_mutex_trylock(m)) == EBUSY)
+ while ((r=pthread_mutex_trylock(m)) == EBUSY) {
+ if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
+ && m->_m_owner == pthread_self()->tid)
+ return EDEADLK;
__wait(&m->_m_lock, &m->_m_waiters, 1, 0);
+ }
return r;
}