projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix broken spinlock due to miscompilation
[musl]
/
src
/
thread
/
pthread_mutex_timedlock.c
diff --git
a/src/thread/pthread_mutex_timedlock.c
b/src/thread/pthread_mutex_timedlock.c
index
20ce012
..
f1c3eed
100644
(file)
--- a/
src/thread/pthread_mutex_timedlock.c
+++ b/
src/thread/pthread_mutex_timedlock.c
@@
-4,8
+4,9
@@
int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *at)
{
int r, w=0;
while ((r=pthread_mutex_trylock(m)) == EBUSY) {
{
int r, w=0;
while ((r=pthread_mutex_trylock(m)) == EBUSY) {
+ if (!(r=m->_m_lock) || (r&0x40000000)) continue;
if (!w) a_inc(&m->_m_waiters), w++;
if (!w) a_inc(&m->_m_waiters), w++;
- if (__timedwait(&m->_m_lock,
1
, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
+ if (__timedwait(&m->_m_lock,
r
, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
if (w) a_dec(&m->_m_waiters);
return ETIMEDOUT;
}
if (w) a_dec(&m->_m_waiters);
return ETIMEDOUT;
}