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

synchronize cond var destruction with exiting waits

Browse source
This commit is contained in:
Rich Felker 2011-10-02 22:58:28 -04:00
commit 5a2e180937
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/thread/pthread_cond_destroy.c
View file

@ -2,5 +2,12 @@
int pthread_cond_destroy(pthread_cond_t *c)
{
int priv = c->_c_mutex != (void *)-1;
int cnt;
c->_c_destroy = 1;
if (c->_c_waiters)
__wake(&c->_c_seq, -1, priv);
while ((cnt = c->_c_waiters))
__wait(&c->_c_waiters, 0, cnt, priv);
return 0;
}

4
src/thread/pthread_cond_timedwait.c
View file

@ -12,6 +12,7 @@ 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_destroy) __wake(&c->_c_waiters, 1, 0);
return;
}
@ -23,6 +24,9 @@ static void unwait(pthread_cond_t *c, pthread_mutex_t *m)
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)