summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-03 12:08:34 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-03 12:08:34 -0400
commit6f1414e10297b75a58a92b678444fd277abc9a4f (patch)
tree2d013654908d7bcbced4036414c2c5890d50bad9
parentf01d35184291c650f6a38f8b3da41693bfde0e70 (diff)
downloadmusl-6f1414e10297b75a58a92b678444fd277abc9a4f.tar.gz
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.
-rw-r--r--src/time/timer_create.c8
-rw-r--r--src/time/timer_delete.c10
2 files changed, 11 insertions, 7 deletions
diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index f02abb86..5d362c7e 100644
--- a/src/time/timer_create.c
+++ b/src/time/timer_create.c
@@ -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;
}
diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index 437de2e0..7c82b183 100644
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -3,11 +3,7 @@
int timer_delete(timer_t t)
{
- pthread_t td = 0;
- int r;
- if ((uintptr_t)t & 1) t = (void *)((unsigned long)t / 2);
- else td = t, t = td->result;
- r = __syscall(SYS_timer_delete, (long)t);
- if (td) pthread_cancel(td);
- return r;
+ if ((uintptr_t)t & 1)
+ return __syscall(SYS_timer_delete, ((unsigned long)t / 2));
+ return pthread_cancel(t);
}