diff options
| -rw-r--r-- | src/internal/libc.h | 1 | ||||
| -rw-r--r-- | src/internal/pthread_impl.h | 7 | ||||
| -rw-r--r-- | src/thread/pthread_cancel.c | 1 | ||||
| -rw-r--r-- | src/thread/pthread_create.c | 18 |
4 files changed, 19 insertions, 8 deletions
diff --git a/src/internal/libc.h b/src/internal/libc.h index bbbb3a4c..c83fcafe 100644 --- a/src/internal/libc.h +++ b/src/internal/libc.h @@ -18,6 +18,7 @@ struct __libc { FILE *ofl_head; int ofl_lock; void (*lockfile)(FILE *); + void (*sigtimer)(); }; diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index 615b963a..f2d0ae8c 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -41,10 +41,14 @@ struct pthread { long off; void *pending; } robust_list; + int unblock_cancel; }; struct __timer { - struct sigevent sev; + int timerid; + union sigval val; + void (*notify)(union sigval); + pthread_t thread; }; #define __SU (sizeof(size_t)/sizeof(int)) @@ -73,7 +77,6 @@ struct __timer { #define SIGCANCEL 32 #define SIGSYSCALL 33 -#define SIGTIMER 32 /* ?? */ int __set_thread_area(void *); int __libc_sigaction(int, const struct sigaction *, struct sigaction *); diff --git a/src/thread/pthread_cancel.c b/src/thread/pthread_cancel.c index 9f7829e6..1ff00ad3 100644 --- a/src/thread/pthread_cancel.c +++ b/src/thread/pthread_cancel.c @@ -2,5 +2,6 @@ int pthread_cancel(pthread_t t) { + t->cancel = 1; return pthread_kill(t, SIGCANCEL); } diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 9f22b4cf..18ee64d6 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -47,20 +47,19 @@ void __pthread_unwind_next(struct __ptcb *cb) static void docancel(struct pthread *self) { struct __ptcb cb = { .__next = self->cancelbuf }; - sigset_t set; self->canceldisable = 1; self->cancelasync = 0; - sigemptyset(&set); - sigaddset(&set, SIGCANCEL); - __libc_sigprocmask(SIG_UNBLOCK, &set, 0); __pthread_unwind_next(&cb); } static void cancel_handler(int sig, siginfo_t *si, void *ctx) { struct pthread *self = __pthread_self(); - if (si->si_code > 0 || si->si_pid != self->pid) return; - self->cancel = 1; + if (!self->cancel) { + if (si->si_code == SI_TIMER && libc.sigtimer) + libc.sigtimer(sig, si, ctx); + return; + } if (self->canceldisable) return; if (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx))) docancel(self); @@ -176,6 +175,12 @@ static void init_threads() static int start(void *p) { struct pthread *self = p; + if (self->unblock_cancel) { + sigset_t set; + sigemptyset(&set); + sigaddset(&set, SIGCANCEL); + __libc_sigprocmask(SIG_UNBLOCK, &set, 0); + } pthread_exit(self->start(self->start_arg)); return 0; } @@ -220,6 +225,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo new->tsd = (void *)tsd; new->detached = attr->_a_detach; new->attr = *attr; + new->unblock_cancel = self->cancel; memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc); new->tlsdesc[1] = (uintptr_t)new; stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15); |