projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keep user-provided CFLAGS/LDFLAGS separate from those added by configure
[musl]
/
src
/
thread
/
pthread_mutex_unlock.c
diff --git
a/src/thread/pthread_mutex_unlock.c
b/src/thread/pthread_mutex_unlock.c
index
5855db0
..
02da92a
100644
(file)
--- a/
src/thread/pthread_mutex_unlock.c
+++ b/
src/thread/pthread_mutex_unlock.c
@@
-1,28
+1,37
@@
#include "pthread_impl.h"
#include "pthread_impl.h"
-int pthread_mutex_unlock(pthread_mutex_t *m)
+int
__
pthread_mutex_unlock(pthread_mutex_t *m)
{
pthread_t self;
{
pthread_t self;
+ int waiters = m->_m_waiters;
+ int cont;
+ int type = m->_m_type & 15;
+ int priv = (m->_m_type & 128) ^ 128;
- if (
m->_m_
type != PTHREAD_MUTEX_NORMAL) {
+ if (type != PTHREAD_MUTEX_NORMAL) {
self = __pthread_self();
self = __pthread_self();
- if ((m->_m_lock&0x
1
fffffff) != self->tid)
- return EPERM;
- if ((
m->_m_type&3) == PTHREAD_MUTEX_RECURSIVE && --
m->_m_count)
- return 0;
- if (
m->_m_type >= 4
) {
+ if ((m->_m_lock&0x
7
fffffff) != self->tid)
+ return EPERM;
+ if ((
type&3) == PTHREAD_MUTEX_RECURSIVE &&
m->_m_count)
+ return
m->_m_count--,
0;
+ if (
!priv
) {
self->robust_list.pending = &m->_m_next;
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;
- a_store(&m->_m_lock, 0);
- self->robust_list.pending = 0;
- } else {
- a_store(&m->_m_lock, 0);
+ __vm_lock();
}
}
- } else {
- a_store(&m->_m_lock, 0);
+ volatile void *prev = m->_m_prev;
+ volatile void *next = m->_m_next;
+ *(volatile void *volatile *)prev = next;
+ if (next != &self->robust_list.head) *(volatile void *volatile *)
+ ((char *)next - sizeof(void *)) = prev;
}
}
-
- if (m->_m_waiters) __wake(&m->_m_lock, 1, 0);
+ cont = a_swap(&m->_m_lock, (type & 8) ? 0x40000000 : 0);
+ if (type != PTHREAD_MUTEX_NORMAL && !priv) {
+ self->robust_list.pending = 0;
+ __vm_unlock();
+ }
+ if (waiters || cont<0)
+ __wake(&m->_m_lock, 1, priv);
return 0;
}
return 0;
}
+
+weak_alias(__pthread_mutex_unlock, pthread_mutex_unlock);