X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_unlock.c;h=0f4a5e6cccc036e03d3bd0feb2f928517dfc0851;hb=3f72cdac73030761120cf32aeef44e7d03e2f1fa;hp=67aa7ba5d14e1e983e25745f8a1104493b413ff8;hpb=047e434ef5fd5437a74f98f63c40a77a683f7f3f;p=musl diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c index 67aa7ba5..0f4a5e6c 100644 --- a/src/thread/pthread_mutex_unlock.c +++ b/src/thread/pthread_mutex_unlock.c @@ -3,22 +3,29 @@ int pthread_mutex_unlock(pthread_mutex_t *m) { pthread_t self; + int waiters = m->_m_waiters; + int cont; if (m->_m_type != PTHREAD_MUTEX_NORMAL) { + if (!m->_m_lock) + return EPERM; self = __pthread_self(); if ((m->_m_lock&0x1fffffff) != self->tid) - return EPERM; + return EPERM; if ((m->_m_type&3) == PTHREAD_MUTEX_RECURSIVE && --m->_m_count) return 0; if (m->_m_type >= 4) { self->robust_list.pending = &m->_m_next; *(void **)m->_m_prev = m->_m_next; if (m->_m_next) ((void **)m->_m_next)[-1] = m->_m_prev; + cont = a_swap(&m->_m_lock, 0); + self->robust_list.pending = 0; + goto wake; } } - - m->_m_lock = 0; - if (m->_m_waiters) __wake(&m->_m_lock, 1, 0); - if (m->_m_type >= 4) self->robust_list.pending = 0; + cont = a_swap(&m->_m_lock, 0); +wake: + if (waiters || cont<0) + __wake(&m->_m_lock, 1, 0); return 0; }