make non-waiting paths of sem_[timed]wait and pthread_join cancelable

per POSIX these functions are both cancellation points, so they must
act on any cancellation request which is pending prior to the call.
previously, only the code path where actual waiting took place could
act on cancellation.

diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c
index 719c91ca24f7b03f729657a27208e10e3bf1c020..abd2d668c9fea70d2eed1f5de287ee8dcc40461e 100644 (file)
--- a/src/thread/pthread_join.c
+++ b/src/thread/pthread_join.c
@@ -8,6 +8,7 @@ static void dummy(void *p)
 int pthread_join(pthread_t t, void **res)
 {
        int tmp;
+       pthread_testcancel();
        while ((tmp = t->tid)) __timedwait(&t->tid, tmp, 0, 0, dummy, 0, 0);
        if (res) *res = t->result;
        if (t->map_base) munmap(t->map_base, t->map_size);

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index b5a60addb0aa7fc398f7a9d7ea93f504d4da16ee..68dcb5044b3169ca389070be5867f509d5937956 100644 (file)
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -8,6 +8,8 @@ static void cleanup(void *p)
 
 int sem_timedwait(sem_t *restrict sem, const struct timespec *restrict at)
 {
+       pthread_testcancel();
+
        if (!sem_trywait(sem)) return 0;
 
        int spins = 100;