projects
/
oweals
/
musl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use a_swap rather than old name a_xchg
[oweals/musl.git]
/
src
/
thread
/
pthread_mutex_unlock.c
diff --git
a/src/thread/pthread_mutex_unlock.c
b/src/thread/pthread_mutex_unlock.c
index 3733788d8ebee7a375d54db6959aef1f8702a623..0f4a5e6cccc036e03d3bd0feb2f928517dfc0851 100644
(file)
--- a/
src/thread/pthread_mutex_unlock.c
+++ b/
src/thread/pthread_mutex_unlock.c
@@
-2,14
+2,30
@@
int pthread_mutex_unlock(pthread_mutex_t *m)
{
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_type != PTHREAD_MUTEX_NORMAL) {
- if (!m->_m_lock || m->_m_lock != __pthread_self()->tid)
- return EPERM;
- if (m->_m_type == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
+ if (!m->_m_lock)
+ return EPERM;
+ self = __pthread_self();
+ if ((m->_m_lock&0x1fffffff) != self->tid)
+ return EPERM;
+ if ((m->_m_type&3) == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
return 0;
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);
+ cont = a_swap(&m->_m_lock, 0);
+wake:
+ if (waiters || cont<0)
+ __wake(&m->_m_lock, 1, 0);
return 0;
}
return 0;
}