jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert to deleting kernel-level timer from cancellation handler

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
src/time/timer_create.c
View file

@ -24,6 +24,12 @@ void __sigtimer_handler(pthread_t self)
pthread_setcancelstate(st, 0); pthread_setcancelstate(st, 0);
} }
static void cleanup(void *p)
{
pthread_t self = p;
__syscall(SYS_timer_delete, self->result);
}
static void *start(void *arg) static void *start(void *arg)
{ {
pthread_t self = __pthread_self(); pthread_t self = __pthread_self();
@ -35,10 +41,12 @@ static void *start(void *arg)
self->start_arg = args->sev->sigev_value.sival_ptr; self->start_arg = args->sev->sigev_value.sival_ptr;
self->result = (void *)-1; self->result = (void *)-1;
pthread_cleanup_push(cleanup, self);
pthread_barrier_wait(&args->b); pthread_barrier_wait(&args->b);
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0); pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
/* Loop on async-signal-safe cancellation point */ /* Loop on async-signal-safe cancellation point */
for (;;) sleep(1); for (;;) sleep(1);
pthread_cleanup_pop(0);
return 0; return 0;
} }

10
src/time/timer_delete.c
View file

@ -3,11 +3,7 @@
int timer_delete(timer_t t) int timer_delete(timer_t t)
{ {
pthread_t td = 0; if ((uintptr_t)t & 1)
int r; return __syscall(SYS_timer_delete, ((unsigned long)t / 2));
if ((uintptr_t)t & 1) t = (void *)((unsigned long)t / 2); return pthread_cancel(t);
else td = t, t = td->result;
r = __syscall(SYS_timer_delete, (long)t);
if (td) pthread_cancel(td);
return r;
} }