summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-16 16:25:00 -0400
committerRich Felker <dalias@aerifal.cx>2011-03-16 16:25:00 -0400
commitd4f9e0b3642a81d07c95302cd9aa0dcaf7de1a05 (patch)
tree8bb9017678027a5f7c0b461fc9e246d34d0ebd1d
parent29fae65780f4c5ccda3758828da7a83073297ccc (diff)
downloadmusl-d4f9e0b3642a81d07c95302cd9aa0dcaf7de1a05.tar.gz
musl-d4f9e0b3642a81d07c95302cd9aa0dcaf7de1a05.tar.bz2
musl-d4f9e0b3642a81d07c95302cd9aa0dcaf7de1a05.tar.xz
musl-d4f9e0b3642a81d07c95302cd9aa0dcaf7de1a05.zip
correct error returns for error-checking mutexes
-rw-r--r--src/thread/pthread_mutex_lock.c6
-rw-r--r--src/thread/pthread_mutex_trylock.c2
2 files changed, 6 insertions, 2 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;
}
diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c
index 2dad7bbf..25b9e869 100644
--- a/src/thread/pthread_mutex_trylock.c
+++ b/src/thread/pthread_mutex_trylock.c
@@ -11,7 +11,7 @@ int pthread_mutex_trylock(pthread_mutex_t *m)
if (m->_m_owner == tid) {
if (m->_m_type != PTHREAD_MUTEX_RECURSIVE)
- return EDEADLK;
+ return EBUSY;
if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN;
m->_m_count++;
return 0;