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.

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index bf4f03ce74b8fd2816f5f19cf6f58e7b8642e890..966b4ab0d11eabf4ab208e44e7ca290a10578c51 100644 (file)
--- 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;