diff options
| author | Bobby Bingham <koorogi@koorogi.info> | 2015-10-04 14:55:29 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-10-15 22:58:59 -0400 |
| commit | 53cd8c5a29b57ef3776ce152e00544752f3ce790 (patch) | |
| tree | 13e79d3d9b7205947b5cdcaec85c3f5a3a1f5dca /src/thread/pthread_join.c | |
| parent | bde0b4b92e2c3f8d26d28e8478f196233ce51618 (diff) | |
| download | musl-53cd8c5a29b57ef3776ce152e00544752f3ce790.tar.gz | |
add missing memory barrier to pthread_join
POSIX requires pthread_join to synchronize memory on success. The
futex wait inside __timedwait_cp cannot handle this because it's not
called in all cases. Also, in the case of a spurious wake, tid can
become zero between the wake and when the joining thread checks it.
Diffstat (limited to 'src/thread/pthread_join.c')
| -rw-r--r-- | src/thread/pthread_join.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c index 966b4ab0..694d377a 100644 --- a/src/thread/pthread_join.c +++ b/src/thread/pthread_join.c @@ -13,6 +13,7 @@ int __pthread_join(pthread_t t, void **res) if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0); while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0); __pthread_setcancelstate(cs, 0); + a_barrier(); if (res) *res = t->result; if (t->map_base) __munmap(t->map_base, t->map_size); return 0; |