diff options
| author | sjg <sjg@FreeBSD.org> | 2014-04-27 08:13:43 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-04-27 08:13:43 +0000 |
| commit | 0c7e03a54c8e7ddc9c3fe710f83d9ca53173692e (patch) | |
| tree | b92e741b68057a24e381faa9809f32030d65574c /lib/libthr/thread/thr_sig.c | |
| parent | c244fcbcaa61dc2a15995e7dbdf3ae8107bc2111 (diff) | |
| parent | 69c3e6933b6946c49fe99b19986f018d71621980 (diff) | |
| download | FreeBSD-src-0c7e03a54c8e7ddc9c3fe710f83d9ca53173692e.zip FreeBSD-src-0c7e03a54c8e7ddc9c3fe710f83d9ca53173692e.tar.gz | |
Merge head
Diffstat (limited to 'lib/libthr/thread/thr_sig.c')
| -rw-r--r-- | lib/libthr/thread/thr_sig.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index 415ddb0..57c9406 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -162,6 +162,7 @@ thr_sighandler(int sig, siginfo_t *info, void *_ucp) act = _thr_sigact[sig-1].sigact; _thr_rwl_unlock(&_thr_sigact[sig-1].lock); errno = err; + curthread->deferred_run = 0; /* * if a thread is in critical region, for example it holds low level locks, @@ -320,14 +321,18 @@ check_deferred_signal(struct pthread *curthread) siginfo_t info; int uc_len; - if (__predict_true(curthread->deferred_siginfo.si_signo == 0)) + if (__predict_true(curthread->deferred_siginfo.si_signo == 0 || + curthread->deferred_run)) return; + curthread->deferred_run = 1; uc_len = __getcontextx_size(); uc = alloca(uc_len); getcontext(uc); - if (curthread->deferred_siginfo.si_signo == 0) + if (curthread->deferred_siginfo.si_signo == 0) { + curthread->deferred_run = 0; return; + } __fillcontextx2((char *)uc); act = curthread->deferred_sigact; uc->uc_sigmask = curthread->deferred_sigmask; |
