diff options
Diffstat (limited to 'src/thread/pthread_mutex_trylock.c')
| -rw-r--r-- | src/thread/pthread_mutex_trylock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c index 783ca0c4..3fe59127 100644 --- a/src/thread/pthread_mutex_trylock.c +++ b/src/thread/pthread_mutex_trylock.c @@ -8,14 +8,14 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) int tid = self->tid; old = m->_m_lock; - own = old & 0x7fffffff; + own = old & 0x3fffffff; if (own == tid && (type&3) == PTHREAD_MUTEX_RECURSIVE) { if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN; m->_m_count++; return 0; } - if (own == 0x7fffffff) return ENOTRECOVERABLE; - if (own && (!(own & 0x40000000) || !(type & 4))) return EBUSY; + if (own == 0x3fffffff) return ENOTRECOVERABLE; + if (own || (old && !(type & 4))) return EBUSY; if (m->_m_type & 128) { if (!self->robust_list.off) { @@ -25,6 +25,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) if (m->_m_waiters) tid |= 0x80000000; self->robust_list.pending = &m->_m_next; } + tid |= old & 0x40000000; if (a_cas(&m->_m_lock, old, tid) != old) { self->robust_list.pending = 0; @@ -39,9 +40,8 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) self->robust_list.head = &m->_m_next; self->robust_list.pending = 0; - if (own) { + if (old) { m->_m_count = 0; - m->_m_type |= 8; return EOWNERDEAD; } |