fix and optimize non-default-type mutex behavior

problem 1: mutex type from the attribute was being ignored by
pthread_mutex_init, so recursive/errorchecking mutexes were never
being used at all.

problem 2: ownership of recursive mutexes was not being enforced at
unlock time.
This commit is contained in:
Rich Felker
2011-03-08 03:41:05 -05:00
parent 1d6b1f1592
commit 4820f9268d
4 changed files with 19 additions and 25 deletions
+5 -8
View File
@@ -2,16 +2,13 @@
int pthread_mutex_unlock(pthread_mutex_t *m)
{
if (m->_m_type == PTHREAD_MUTEX_RECURSIVE) {
if (a_fetch_add(&m->_m_lock, -1)==1 && m->_m_waiters)
__wake(&m->_m_lock, 1, 0);
return 0;
if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
if (m->_m_owner != pthread_self()->tid)
return EPERM;
if (m->_m_type == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
return 0;
}
if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
&& m->_m_owner != pthread_self()->tid)
return EPERM;
m->_m_owner = 0;
m->_m_lock = 0;
if (m->_m_waiters) __wake(&m->_m_lock, 1, 0);