diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-03-17 12:21:32 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-03-17 12:21:32 -0400 |
| commit | b1c43161c2b37e35eae60fa61621a24a5d820d83 (patch) | |
| tree | b6c532f959850f42ad219d87b721a587973c6654 /src/thread/pthread_mutex_trylock.c | |
| parent | e914f8b7ec79f622fa3b017af434642f61d45ce8 (diff) | |
| download | musl-b1c43161c2b37e35eae60fa61621a24a5d820d83.tar.gz musl-b1c43161c2b37e35eae60fa61621a24a5d820d83.tar.bz2 musl-b1c43161c2b37e35eae60fa61621a24a5d820d83.tar.xz musl-b1c43161c2b37e35eae60fa61621a24a5d820d83.zip | |
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.
Diffstat (limited to 'src/thread/pthread_mutex_trylock.c')
| -rw-r--r-- | src/thread/pthread_mutex_trylock.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; } |