X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_broadcast.c;h=848e288f5ea6dc25de38b901210bbace6f2bc2de;hp=4fab9994ed399e28a8ba0a8b138e129dfc0ba5f9;hb=72768ea99e67162b7b42d9cd8917cf9a2c00f1f1;hpb=cf940165d4caf132405a3fe3df58b57eb735ac04 diff --git a/src/thread/pthread_cond_broadcast.c b/src/thread/pthread_cond_broadcast.c index 4fab9994..848e288f 100644 --- a/src/thread/pthread_cond_broadcast.c +++ b/src/thread/pthread_cond_broadcast.c @@ -1,44 +1,39 @@ #include "pthread_impl.h" -static void unlock(pthread_cond_t *c) -{ - a_dec(&c->_c_bcast); - if (c->_c_leavers) __wake(&c->_c_bcast, -1, 0); -} - int pthread_cond_broadcast(pthread_cond_t *c) { pthread_mutex_t *m; - int w; if (!c->_c_waiters) return 0; - a_inc(&c->_c_bcast); - if (!c->_c_waiters) { - unlock(c); - return 0; - } - a_store(&c->_c_block, 0); + a_inc(&c->_c_seq); - m = c->_c_mutex; - - /* If mutex ptr is not available, simply wake all waiters. */ - if (m == (void *)-1) { - unlock(c); - __wake(&c->_c_block, -1, 0); + /* If cond var is process-shared, simply wake all waiters. */ + if (c->_c_mutex == (void *)-1) { + __wake(&c->_c_seq, -1, 0); return 0; } + /* Block waiters from returning so we can use the mutex. */ + while (a_swap(&c->_c_lock, 1)) + __wait(&c->_c_lock, &c->_c_lockwait, 1, 1); + if (!c->_c_waiters) + goto out; + m = c->_c_mutex; + /* Move waiter count to the mutex */ - w = a_swap(&c->_c_waiters, 0); - a_fetch_add(&m->_m_waiters, w); + a_fetch_add(&m->_m_waiters, c->_c_waiters2); + c->_c_waiters2 = 0; /* Perform the futex requeue, waking one waiter unless we know * that the calling thread holds the mutex. */ - __syscall(SYS_futex, &c->_c_block, FUTEX_REQUEUE, + __syscall(SYS_futex, &c->_c_seq, FUTEX_REQUEUE, !m->_m_type || (m->_m_lock&INT_MAX)!=pthread_self()->tid, INT_MAX, &m->_m_lock); - unlock(c); +out: + a_store(&c->_c_lock, 0); + if (c->_c_lockwait) __wake(&c->_c_lock, 1, 0); + return 0; }