aboutsummaryrefslogtreecommitdiff
path: root/src/time/timer_delete.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/time/timer_delete.c')
-rw-r--r--src/time/timer_delete.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index caf0489..437de2e 100644
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -3,10 +3,11 @@
int timer_delete(timer_t t)
{
- if (t->thread) pthread_cancel(t->thread);
- else {
- __syscall(SYS_timer_delete, t->timerid);
- free(t);
- }
- return 0;
+ 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;
}