revert to deleting kernel-level timer from cancellation handler

this is necessary in order to avoid breaking timer_getoverrun in the
last run of the timer event handler, if it has not yet finished.
This commit is contained in:
Rich Felker 2011-04-03 12:08:34 -04:00
commit 6f1414e102
2 changed files with 11 additions and 7 deletions

View file

@ -24,6 +24,12 @@ void __sigtimer_handler(pthread_t self)
pthread_setcancelstate(st, 0);
}
static void cleanup(void *p)
{
pthread_t self = p;
__syscall(SYS_timer_delete, self->result);
}
static void *start(void *arg)
{
pthread_t self = __pthread_self();
@ -35,10 +41,12 @@ 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(1);
pthread_cleanup_pop(0);
return 0;
}