jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert previous change in cond var waiter move

Browse source 
using swap has a race condition: the waiters must be added to the
mutex waiter count *before* they are taken off the cond var waiter
count, or wake events can be lost.
This commit is contained in:
Rich Felker 2011-09-25 21:14:40 -04:00
commit c11d1e6967
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/thread/pthread_cond_broadcast.c
View file

@ -30,8 +30,12 @@ int pthread_cond_broadcast(pthread_cond_t *c)
} }
/* Move waiter count to the mutex */ /* Move waiter count to the mutex */
w = a_swap(&c->_c_waiters, 0); for (;;) {
a_fetch_add(&m->_m_waiters, w); w = c->_c_waiters;
a_fetch_add(&m->_m_waiters, w);
if (a_cas(&c->_c_waiters, w, 0) == w) break;
a_fetch_add(&m->_m_waiters, -w);
}
/* Perform the futex requeue, waking one waiter unless we know /* Perform the futex requeue, waking one waiter unless we know
* that the calling thread holds the mutex. */ * that the calling thread holds the mutex. */