From b1c43161c2b37e35eae60fa61621a24a5d820d83 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 17 Mar 2011 12:21:32 -0400 Subject: 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. --- src/thread/pthread_mutex_lock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/thread/pthread_mutex_lock.c') diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c index 82556141..56111ec8 100644 --- a/src/thread/pthread_mutex_lock.c +++ b/src/thread/pthread_mutex_lock.c @@ -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; } -- cgit v1.2.1