projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initial, very primitive strfmon
[musl]
/
src
/
thread
/
pthread_cond_timedwait.c
diff --git
a/src/thread/pthread_cond_timedwait.c
b/src/thread/pthread_cond_timedwait.c
index
e9b5e2f
..
1d0f578
100644
(file)
--- a/
src/thread/pthread_cond_timedwait.c
+++ b/
src/thread/pthread_cond_timedwait.c
@@
-12,17
+12,21
@@
static void unwait(pthread_cond_t *c, pthread_mutex_t *m)
if (c->_c_mutex == (void *)-1) {
a_dec(&c->_c_waiters);
if (c->_c_mutex == (void *)-1) {
a_dec(&c->_c_waiters);
+ if (c->_c_destroy) __wake(&c->_c_waiters, 1, 0);
return;
}
while (a_swap(&c->_c_lock, 1))
__wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
return;
}
while (a_swap(&c->_c_lock, 1))
__wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
- if (c->_c_waiters
) c->_c_waiters
--;
+ if (c->_c_waiters
2) c->_c_waiters2
--;
else a_dec(&m->_m_waiters);
a_store(&c->_c_lock, 0);
if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1);
else a_dec(&m->_m_waiters);
a_store(&c->_c_lock, 0);
if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1);
+
+ a_dec(&c->_c_waiters);
+ if (c->_c_destroy) __wake(&c->_c_waiters, 1, 1);
}
static void cleanup(void *p)
}
static void cleanup(void *p)
@@
-37,25
+41,28
@@
int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t
struct cm cm = { .c=c, .m=m };
int r, e=0, seq;
struct cm cm = { .c=c, .m=m };
int r, e=0, seq;
+ if (m->_m_type && (m->_m_lock&INT_MAX) != pthread_self()->tid)
+ return EPERM;
+
if (ts && ts->tv_nsec >= 1000000000UL)
return EINVAL;
pthread_testcancel();
if (ts && ts->tv_nsec >= 1000000000UL)
return EINVAL;
pthread_testcancel();
- if (c->_c_mutex == (void *)-1) {
- a_inc(&c->_c_waiters);
-
} else
{
+ a_inc(&c->_c_waiters);
+
+
if (c->_c_mutex != (void *)-1)
{
c->_c_mutex = m;
while (a_swap(&c->_c_lock, 1))
__wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
c->_c_mutex = m;
while (a_swap(&c->_c_lock, 1))
__wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
- c->_c_waiters++;
+ c->_c_waiters
2
++;
a_store(&c->_c_lock, 0);
if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1);
}
seq = c->_c_seq;
a_store(&c->_c_lock, 0);
if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1);
}
seq = c->_c_seq;
-
if ((r=pthread_mutex_unlock(m))) return r
;
+
pthread_mutex_unlock(m)
;
do e = __timedwait(&c->_c_seq, seq, c->_c_clock, ts, cleanup, &cm, 0);
while (c->_c_seq == seq && (!e || e==EINTR));
do e = __timedwait(&c->_c_seq, seq, c->_c_clock, ts, cleanup, &cm, 0);
while (c->_c_seq == seq && (!e || e==EINTR));