projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update license of njk contributed code (x86_64 asm)
[musl]
/
src
/
time
/
timer_delete.c
diff --git
a/src/time/timer_delete.c
b/src/time/timer_delete.c
index
caf0489
..
b5f8ca1
100644
(file)
--- a/
src/time/timer_delete.c
+++ b/
src/time/timer_delete.c
@@
-3,10
+3,11
@@
int timer_delete(timer_t t)
{
int timer_delete(timer_t t)
{
- if (t->thread) pthread_cancel(t->thread);
- else {
- __syscall(SYS_timer_delete, t->timerid);
- free(t);
+ if ((uintptr_t)t >= 0x100000) {
+ pthread_t td = t;
+ td->delete_timer = 1;
+ __wake(&td->delete_timer, 1, 1);
+ return 0;
}
}
- return
0
;
+ return
__syscall(SYS_timer_delete, (long)t)
;
}
}