diff options
Diffstat (limited to 'src/thread/pthread_mutex_unlock.c')
| -rw-r--r-- | src/thread/pthread_mutex_unlock.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c index 7dd00d27..b66423e6 100644 --- a/src/thread/pthread_mutex_unlock.c +++ b/src/thread/pthread_mutex_unlock.c @@ -7,13 +7,19 @@ int __pthread_mutex_unlock(pthread_mutex_t *m) int cont; int type = m->_m_type & 15; int priv = (m->_m_type & 128) ^ 128; + int new = 0; + int old; if (type != PTHREAD_MUTEX_NORMAL) { self = __pthread_self(); - if ((m->_m_lock&0x7fffffff) != self->tid) + old = m->_m_lock; + int own = old & 0x3fffffff; + if (own != self->tid) return EPERM; if ((type&3) == PTHREAD_MUTEX_RECURSIVE && m->_m_count) return m->_m_count--, 0; + if ((type&4) && (old&0x40000000)) + new = 0x7fffffff; if (!priv) { self->robust_list.pending = &m->_m_next; __vm_lock(); @@ -24,7 +30,16 @@ int __pthread_mutex_unlock(pthread_mutex_t *m) if (next != &self->robust_list.head) *(volatile void *volatile *) ((char *)next - sizeof(void *)) = prev; } - cont = a_swap(&m->_m_lock, (type & 8) ? 0x7fffffff : 0); + if (type&8) { + if (old<0 || a_cas(&m->_m_lock, old, new)!=old) { + if (new) a_store(&m->_m_waiters, -1); + __syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv); + } + cont = 0; + waiters = 0; + } else { + cont = a_swap(&m->_m_lock, new); + } if (type != PTHREAD_MUTEX_NORMAL && !priv) { self->robust_list.pending = 0; __vm_unlock(); |