diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-10-02 22:58:28 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-10-02 22:58:28 -0400 |
| commit | 5a2e18093725c3965486641f0ad0b61a44f7ed68 (patch) | |
| tree | c54f6ec534e0d9bc32367b4c404b2a35752cebc3 | |
| parent | b85fec2ded3f005b877e25b63215c0d09d4a9f7f (diff) | |
| download | musl-5a2e18093725c3965486641f0ad0b61a44f7ed68.tar.gz | |
synchronize cond var destruction with exiting waits
| -rw-r--r-- | src/internal/pthread_impl.h | 1 | ||||
| -rw-r--r-- | src/thread/pthread_cond_destroy.c | 7 | ||||
| -rw-r--r-- | src/thread/pthread_cond_timedwait.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index dd3863fc..98d9b22d 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -71,6 +71,7 @@ struct __timer { #define _c_lock __u.__i[5] #define _c_lockwait __u.__i[6] #define _c_waiters2 __u.__i[7] +#define _c_destroy __u.__i[8] #define _rw_lock __u.__i[0] #define _rw_waiters __u.__i[1] #define _b_lock __u.__i[0] diff --git a/src/thread/pthread_cond_destroy.c b/src/thread/pthread_cond_destroy.c index 1d21a5a8..a096c554 100644 --- a/src/thread/pthread_cond_destroy.c +++ b/src/thread/pthread_cond_destroy.c @@ -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; } diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index 56e71c2d..1d0f578c 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -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) |