projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reorganize pthread data structures and move the definitions to alltypes.h
[musl]
/
src
/
thread
/
pthread_mutex_trylock.c
diff --git
a/src/thread/pthread_mutex_trylock.c
b/src/thread/pthread_mutex_trylock.c
index
1e3817b
..
29268fd
100644
(file)
--- a/
src/thread/pthread_mutex_trylock.c
+++ b/
src/thread/pthread_mutex_trylock.c
@@
-2,27
+2,27
@@
int pthread_mutex_trylock(pthread_mutex_t *m)
{
int pthread_mutex_trylock(pthread_mutex_t *m)
{
- if (m->__type == PTHREAD_MUTEX_RECURSIVE) {
+ if (m->_
m
_type == PTHREAD_MUTEX_RECURSIVE) {
pthread_t self = pthread_self();
pthread_t self = pthread_self();
- if (m->_
_owner == self
) {
- if ((unsigned)m->__lock >= INT_MAX) return EAGAIN;
- a_inc(&m->__lock);
+ if (m->_
m_owner == self->tid
) {
+ if ((unsigned)m->_
m
_lock >= INT_MAX) return EAGAIN;
+ a_inc(&m->_
m
_lock);
return 0;
}
return 0;
}
- if (a_fetch_add(&m->__lock, 1)) {
- if (a_fetch_add(&m->_
_lock, -1)==1 && m->_
_waiters)
- __wake(&m->__lock, 1, 0);
+ if (a_fetch_add(&m->_
m
_lock, 1)) {
+ if (a_fetch_add(&m->_
m_lock, -1)==1 && m->_m
_waiters)
+ __wake(&m->_
m
_lock, 1, 0);
return EBUSY;
}
return EBUSY;
}
- m->_
_owner = self
;
+ m->_
m_owner = self->tid
;
return 0;
}
return 0;
}
- if (a_xchg(&m->__lock, 1))
- if (m->__type == PTHREAD_MUTEX_ERRORCHECK
- && m->_
_owner == pthread_self()
) return EDEADLK;
+ if (a_xchg(&m->_
m
_lock, 1))
+ if (m->_
m
_type == PTHREAD_MUTEX_ERRORCHECK
+ && m->_
m_owner == pthread_self()->tid
) return EDEADLK;
else return EBUSY;
else return EBUSY;
- if (m->__type == PTHREAD_MUTEX_ERRORCHECK)
- m->_
_owner = pthread_self()
;
+ if (m->_
m
_type == PTHREAD_MUTEX_ERRORCHECK)
+ m->_
m_owner = pthread_self()->tid
;
return 0;
}
return 0;
}