From 4820f9268d3dc1f2aac923de0a591ffd5d54ea89 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 8 Mar 2011 03:41:05 -0500 Subject: 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. --- src/thread/pthread_mutex_unlock.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/thread/pthread_mutex_unlock.c') diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c index 0275eb52..39cea4b6 100644 --- a/src/thread/pthread_mutex_unlock.c +++ b/src/thread/pthread_mutex_unlock.c @@ -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); -- cgit v1.2.1