simplify and optimize pthread_mutex_trylock

This commit is contained in:
Rich Felker 2011-03-08 12:20:10 -05:00
parent e5dd18319b
commit 31e06075d5
1 changed files with 16 additions and 17 deletions

View File

@ -2,24 +2,23 @@
int pthread_mutex_trylock(pthread_mutex_t *m) int pthread_mutex_trylock(pthread_mutex_t *m)
{ {
pthread_t self; int tid;
if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
self = pthread_self(); if (m->_m_type == PTHREAD_MUTEX_NORMAL)
if (m->_m_type == PTHREAD_MUTEX_RECURSIVE return -a_xchg(&m->_m_lock, 1) & EBUSY;
&& m->_m_owner == self->tid) {
tid = pthread_self()->tid;
if (m->_m_owner == tid) {
if (m->_m_type != PTHREAD_MUTEX_RECURSIVE)
return EDEADLK;
if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN; if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN;
m->_m_count++; m->_m_count++;
return 0; return 0;
} }
}
if (a_xchg(&m->_m_lock, 1)) if (a_xchg(&m->_m_lock, 1)) return EBUSY;
if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK m->_m_owner = tid;
&& m->_m_owner == self->tid) return EDEADLK;
else return EBUSY;
if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
m->_m_owner = self->tid;
m->_m_count = 1; m->_m_count = 1;
}
return 0; return 0;
} }