diff options
author | deischen <deischen@FreeBSD.org> | 2002-06-28 13:28:41 +0000 |
---|---|---|
committer | deischen <deischen@FreeBSD.org> | 2002-06-28 13:28:41 +0000 |
commit | aafea422a54211f73e016cb9e1a9acee97fd998a (patch) | |
tree | 62d632e168cc9d7923144927d82bf07c481c79ed /lib/libkse/thread | |
parent | 1ef8e6c4af8793b1aa6bd0b8eb28b38fc7fd4744 (diff) | |
download | FreeBSD-src-aafea422a54211f73e016cb9e1a9acee97fd998a.zip FreeBSD-src-aafea422a54211f73e016cb9e1a9acee97fd998a.tar.gz |
Make sigpending and sigsuspend account for signals that are pending on
the process as well as pending on the current thread.
Reported by: Andrew MacIntyre <andymac@bullseye.apana.org.au>
Diffstat (limited to 'lib/libkse/thread')
-rw-r--r-- | lib/libkse/thread/thr_sigpending.c | 8 | ||||
-rw-r--r-- | lib/libkse/thread/thr_sigsuspend.c | 24 |
2 files changed, 27 insertions, 5 deletions
diff --git a/lib/libkse/thread/thr_sigpending.c b/lib/libkse/thread/thr_sigpending.c index 3c7efa4..5eaf6ff 100644 --- a/lib/libkse/thread/thr_sigpending.c +++ b/lib/libkse/thread/thr_sigpending.c @@ -31,6 +31,9 @@ * * $FreeBSD$ */ +#include <sys/param.h> +#include <sys/types.h> +#include <sys/signalvar.h> #include <signal.h> #include <errno.h> #include <pthread.h> @@ -39,9 +42,9 @@ __weak_reference(_sigpending, sigpending); int -_sigpending(sigset_t * set) +_sigpending(sigset_t *set) { - struct pthread *curthread = _get_curthread(); + struct pthread *curthread = _get_curthread(); int ret = 0; /* Check for a null signal set pointer: */ @@ -51,6 +54,7 @@ _sigpending(sigset_t * set) } else { *set = curthread->sigpend; + SIGSETOR(*set, _process_sigpending); } /* Return the completion status: */ return (ret); diff --git a/lib/libkse/thread/thr_sigsuspend.c b/lib/libkse/thread/thr_sigsuspend.c index 1201097..42f174b 100644 --- a/lib/libkse/thread/thr_sigsuspend.c +++ b/lib/libkse/thread/thr_sigsuspend.c @@ -32,6 +32,8 @@ * $FreeBSD$ */ #include <signal.h> +#include <sys/param.h> +#include <sys/signalvar.h> #include <errno.h> #include <pthread.h> #include "pthread_private.h" @@ -43,7 +45,7 @@ _sigsuspend(const sigset_t * set) { struct pthread *curthread = _get_curthread(); int ret = -1; - sigset_t oset; + sigset_t oset, sigset; /* Check if a new signal set was provided by the caller: */ if (set != NULL) { @@ -53,8 +55,24 @@ _sigsuspend(const sigset_t * set) /* Change the caller's mask: */ curthread->sigmask = *set; - /* Wait for a signal: */ - _thread_kern_sched_state(PS_SIGSUSPEND, __FILE__, __LINE__); + /* + * Check if there are pending signals for the running + * thread or process that aren't blocked: + */ + sigset = curthread->sigpend; + SIGSETOR(sigset, _process_sigpending); + SIGSETNAND(sigset, curthread->sigmask); + if (SIGNOTEMPTY(sigset)) { + /* + * Call the kernel scheduler which will safely + * install a signal frame for the running thread: + */ + _thread_kern_sched_sig(); + } else { + /* Wait for a signal: */ + _thread_kern_sched_state(PS_SIGSUSPEND, + __FILE__, __LINE__); + } /* Always return an interrupted error: */ errno = EINTR; |