diff options
| -rw-r--r-- | src/thread/pthread_cond_broadcast.c | 5 | ||||
| -rw-r--r-- | src/thread/pthread_cond_signal.c | 5 | ||||
| -rw-r--r-- | src/thread/pthread_cond_timedwait.c | 13 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/thread/pthread_cond_broadcast.c b/src/thread/pthread_cond_broadcast.c index 6002c535..dec91164 100644 --- a/src/thread/pthread_cond_broadcast.c +++ b/src/thread/pthread_cond_broadcast.c @@ -2,8 +2,7 @@ int pthread_cond_broadcast(pthread_cond_t *c) { - int w = c->_c_waiters; - if (a_swap(&c->_c_block, 0) || w) - __wake(&c->_c_block, -1, 0); + a_store(&c->_c_block, 0); + if (c->_c_waiters) __wake(&c->_c_block, -1, 0); return 0; } diff --git a/src/thread/pthread_cond_signal.c b/src/thread/pthread_cond_signal.c index e8ed71cc..b26b8ce5 100644 --- a/src/thread/pthread_cond_signal.c +++ b/src/thread/pthread_cond_signal.c @@ -2,8 +2,7 @@ int pthread_cond_signal(pthread_cond_t *c) { - int w = c->_c_waiters; - if (a_swap(&c->_c_block, 0) || w) - __wake(&c->_c_block, 1, 0); + a_store(&c->_c_block, 0); + if (c->_c_waiters) __wake(&c->_c_block, 1, 0); return 0; } diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index ec5aa6f4..c71edc95 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -15,19 +15,22 @@ static void cleanup(void *p) int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *ts) { struct cm cm = { .c=c, .m=m }; - int r, e=0; + int r, e, tid; if (ts && ts->tv_nsec >= 1000000000UL) return EINVAL; pthread_testcancel(); - c->_c_block = 1; + a_inc(&c->_c_waiters); + c->_c_block = tid = pthread_self()->tid; + if ((r=pthread_mutex_unlock(m))) return r; - a_inc(&c->_c_waiters); - do e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, cleanup, &cm, 0); - while (e == EINTR); + do e = __timedwait(&c->_c_block, tid, c->_c_clock, ts, cleanup, &cm, 0); + while (c->_c_block == tid && (!e || e==EINTR)); + if (e == EINTR) e = 0; + a_dec(&c->_c_waiters); if ((r=pthread_mutex_lock(m))) return r; |