unify lock and owner fields of mutex structure

this change is necessary to free up one slot in the mutex structure so
that we can use doubly-linked lists in the implementation of robust
mutexes.
This commit is contained in:
Rich Felker
2011-03-17 12:21:32 -04:00
parent e914f8b7ec
commit b1c43161c2
4 changed files with 6 additions and 8 deletions

View File

@ -4,10 +4,11 @@ int pthread_mutex_lock(pthread_mutex_t *m)
{
int r;
while ((r=pthread_mutex_trylock(m)) == EBUSY) {
if (!(r=m->_m_lock)) continue;
if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
&& m->_m_owner == pthread_self()->tid)
&& r == pthread_self()->tid)
return EDEADLK;
__wait(&m->_m_lock, &m->_m_waiters, 1, 0);
__wait(&m->_m_lock, &m->_m_waiters, r, 0);
}
return r;
}