diff options
author | Rich Felker <dalias@aerifal.cx> | 2015-03-02 18:52:31 -0500 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2015-03-02 18:52:31 -0500 |
commit | eb4bd8d8bb5c9f535ee8250edd4efbd3d4f84c5a (patch) | |
tree | 6dd3fcedf1a3694c0150d7327d56e5d88f10955a /src | |
parent | a3de8f7fbc5a2cc838b96e8702363ef7682da5ae (diff) | |
download | musl-eb4bd8d8bb5c9f535ee8250edd4efbd3d4f84c5a.tar.gz musl-eb4bd8d8bb5c9f535ee8250edd4efbd3d4f84c5a.tar.xz musl-eb4bd8d8bb5c9f535ee8250edd4efbd3d4f84c5a.zip |
suppress masked cancellation in pthread_join
like close, pthread_join is a resource-deallocation function which is also a cancellation point. the intent of masked cancellation mode is to exempt such functions from failure with ECANCELED.
Diffstat (limited to 'src')
-rw-r--r-- | src/thread/pthread_join.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c index bf4f03ce..966b4ab0 100644 --- a/src/thread/pthread_join.c +++ b/src/thread/pthread_join.c @@ -3,12 +3,16 @@ int __munmap(void *, size_t); void __pthread_testcancel(void); +int __pthread_setcancelstate(int, int *); int __pthread_join(pthread_t t, void **res) { - int tmp; + int tmp, cs; __pthread_testcancel(); + __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); + 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); if (res) *res = t->result; if (t->map_base) __munmap(t->map_base, t->map_size); return 0; |