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_trylock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/thread/pthread_mutex_trylock.c') diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c index 6fc604fe..de57ff9e 100644 --- a/src/thread/pthread_mutex_trylock.c +++ b/src/thread/pthread_mutex_trylock.c @@ -9,14 +9,13 @@ int pthread_mutex_trylock(pthread_mutex_t *m) tid = pthread_self()->tid; - if (m->_m_owner == tid && m->_m_type == PTHREAD_MUTEX_RECURSIVE) { + if (m->_m_lock == tid && m->_m_type == PTHREAD_MUTEX_RECURSIVE) { if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN; m->_m_count++; return 0; } - if (m->_m_owner || a_xchg(&m->_m_lock, 1)) return EBUSY; - m->_m_owner = tid; + if (m->_m_lock || a_cas(&m->_m_lock, 0, tid)) return EBUSY; m->_m_count = 1; return 0; } -- cgit v1.2.1