diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/internal/pthread_impl.h | 1 | ||||
| -rw-r--r-- | src/time/timer_create.c | 28 | ||||
| -rw-r--r-- | src/time/timer_delete.c | 7 |
3 files changed, 21 insertions, 15 deletions
diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index 0bcc54cc..3e436aef 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -42,6 +42,7 @@ struct pthread { void *pending; } robust_list; int unblock_cancel; + int delete_timer; }; struct __timer { diff --git a/src/time/timer_create.c b/src/time/timer_create.c index a0ee845c..1b184f74 100644 --- a/src/time/timer_create.c +++ b/src/time/timer_create.c @@ -13,21 +13,24 @@ struct start_args { struct sigevent *sev; }; +static void cleanup_fromsig(void *p) +{ + pthread_t self = __pthread_self(); + self->cancel = 0; + self->cancelbuf = 0; + longjmp(p, 1); +} + void __sigtimer_handler(pthread_t self) { - int st; + jmp_buf jb; void (*notify)(union sigval) = (void (*)(union sigval))self->start; union sigval val = { .sival_ptr = self->start_arg }; - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &st); + if (setjmp(jb)) return; + pthread_cleanup_push(cleanup_fromsig, jb); notify(val); - pthread_setcancelstate(st, 0); -} - -static void cleanup(void *p) -{ - pthread_t self = p; - __syscall(SYS_timer_delete, self->result); + pthread_cleanup_pop(0); } static void *start(void *arg) @@ -41,12 +44,9 @@ static void *start(void *arg) self->start_arg = args->sev->sigev_value.sival_ptr; self->result = (void *)-1; - pthread_cleanup_push(cleanup, self); pthread_barrier_wait(&args->b); - pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0); - /* Loop on async-signal-safe cancellation point */ - for (;;) sleep(1000000000); - pthread_cleanup_pop(0); + __wait(&self->delete_timer, 0, 0, 1); + __syscall(SYS_timer_delete, self->result); return 0; } diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c index f05b27d5..b5f8ca19 100644 --- a/src/time/timer_delete.c +++ b/src/time/timer_delete.c @@ -3,6 +3,11 @@ int timer_delete(timer_t t) { - if ((uintptr_t)t >= 0x100000) return pthread_cancel(t); + if ((uintptr_t)t >= 0x100000) { + pthread_t td = t; + td->delete_timer = 1; + __wake(&td->delete_timer, 1, 1); + return 0; + } return __syscall(SYS_timer_delete, (long)t); } |