summaryrefslogtreecommitdiff
path: root/src/thread/pthread_mutex_trylock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/thread/pthread_mutex_trylock.c')
-rw-r--r--src/thread/pthread_mutex_trylock.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c
index cb935651..0df3ce29 100644
--- 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;
- 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) {
@@ -23,6 +17,10 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
if (own == 0x40000000) return ENOTRECOVERABLE;
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;
}