projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aarch64: add HWCAP_DCPOP from linux v4.14
[musl]
/
src
/
thread
/
pthread_mutex_trylock.c
diff --git
a/src/thread/pthread_mutex_trylock.c
b/src/thread/pthread_mutex_trylock.c
index
e851517
..
54876a6
100644
(file)
--- a/
src/thread/pthread_mutex_trylock.c
+++ b/
src/thread/pthread_mutex_trylock.c
@@
-7,12
+7,6
@@
int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
pthread_t self = __pthread_self();
int tid = self->tid;
pthread_t self = __pthread_self();
int tid = self->tid;
- if (!self->robust_list.off) {
- __syscall(SYS_set_robust_list, &self->robust_list, 3*sizeof(long));
- self->robust_list.head = &self->robust_list.head;
- self->robust_list.off = (char*)&m->_m_lock-(char *)&m->_m_next;
- }
-
old = m->_m_lock;
own = old & 0x7fffffff;
if (own == tid && (type&3) == PTHREAD_MUTEX_RECURSIVE) {
old = m->_m_lock;
own = old & 0x7fffffff;
if (own == tid && (type&3) == PTHREAD_MUTEX_RECURSIVE) {
@@
-20,9
+14,13
@@
int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
m->_m_count++;
return 0;
}
m->_m_count++;
return 0;
}
- if (own == 0x
40000000
) return ENOTRECOVERABLE;
+ if (own == 0x
7fffffff
) return ENOTRECOVERABLE;
if (m->_m_type & 128) {
if (m->_m_type & 128) {
+ if (!self->robust_list.off) {
+ self->robust_list.off = (char*)&m->_m_lock-(char *)&m->_m_next;
+ __syscall(SYS_set_robust_list, &self->robust_list, 3*sizeof(long));
+ }
if (m->_m_waiters) tid |= 0x80000000;
self->robust_list.pending = &m->_m_next;
}
if (m->_m_waiters) tid |= 0x80000000;
self->robust_list.pending = &m->_m_next;
}
@@
-50,9
+48,11
@@
int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
return 0;
}
return 0;
}
-int pthread_mutex_trylock(pthread_mutex_t *m)
+int
__
pthread_mutex_trylock(pthread_mutex_t *m)
{
if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL)
return a_cas(&m->_m_lock, 0, EBUSY) & EBUSY;
return __pthread_mutex_trylock_owner(m);
}
{
if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL)
return a_cas(&m->_m_lock, 0, EBUSY) & EBUSY;
return __pthread_mutex_trylock_owner(m);
}
+
+weak_alias(__pthread_mutex_trylock, pthread_mutex_trylock);