diff options
Diffstat (limited to 'src/thread/pthread_mutex_trylock.c')
| -rw-r--r-- | src/thread/pthread_mutex_trylock.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c index 29268fdb..7ff4f703 100644 --- a/src/thread/pthread_mutex_trylock.c +++ b/src/thread/pthread_mutex_trylock.c @@ -2,27 +2,24 @@ int pthread_mutex_trylock(pthread_mutex_t *m) { - if (m->_m_type == PTHREAD_MUTEX_RECURSIVE) { - pthread_t self = pthread_self(); - if (m->_m_owner == self->tid) { - if ((unsigned)m->_m_lock >= INT_MAX) return EAGAIN; - a_inc(&m->_m_lock); + pthread_t self; + if (m->_m_type != PTHREAD_MUTEX_NORMAL) { + self = pthread_self(); + if (m->_m_type == PTHREAD_MUTEX_RECURSIVE + && m->_m_owner == self->tid) { + if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN; + m->_m_count++; return 0; } - if (a_fetch_add(&m->_m_lock, 1)) { - if (a_fetch_add(&m->_m_lock, -1)==1 && m->_m_waiters) - __wake(&m->_m_lock, 1, 0); - return EBUSY; - } - m->_m_owner = self->tid; - return 0; } if (a_xchg(&m->_m_lock, 1)) if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK - && m->_m_owner == pthread_self()->tid) return EDEADLK; + && m->_m_owner == self->tid) return EDEADLK; else return EBUSY; - if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK) - m->_m_owner = pthread_self()->tid; + if (m->_m_type != PTHREAD_MUTEX_NORMAL) { + m->_m_owner = self->tid; + m->_m_count = 1; + } return 0; } |