diff options
| author | davidxu <davidxu@FreeBSD.org> | 2003-07-27 06:46:34 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2003-07-27 06:46:34 +0000 |
| commit | 2947f8c61fcdd34962f65b08e22b46f3283d14e6 (patch) | |
| tree | 254625951b796541eac02c275f4b7a44f57514a6 /lib/libpthread/thread/thr_sigwait.c | |
| parent | 56615188dca4d47b32b74f0700ca0f0e174f6b08 (diff) | |
| download | FreeBSD-src-2947f8c61fcdd34962f65b08e22b46f3283d14e6.zip FreeBSD-src-2947f8c61fcdd34962f65b08e22b46f3283d14e6.tar.gz | |
Simplify sigwait code a bit by using a waitset and removing oldsigmask.
Reviewed by: deischen
Diffstat (limited to 'lib/libpthread/thread/thr_sigwait.c')
| -rw-r--r-- | lib/libpthread/thread/thr_sigwait.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libpthread/thread/thr_sigwait.c b/lib/libpthread/thread/thr_sigwait.c index 041a7e9..d3c0038 100644 --- a/lib/libpthread/thread/thr_sigwait.c +++ b/lib/libpthread/thread/thr_sigwait.c @@ -50,6 +50,7 @@ lib_sigtimedwait(const sigset_t *set, siginfo_t *info, struct pthread *curthread = _get_curthread(); int ret = 0; int i; + struct sigwait_data waitdata; sigset_t waitset; kse_critical_t crit; siginfo_t siginfo; @@ -97,11 +98,10 @@ lib_sigtimedwait(const sigset_t *set, siginfo_t *info, curthread->interrupted = 0; _thr_set_timeout(timeout); /* Wait for a signal: */ - curthread->oldsigmask = curthread->sigmask; siginfo.si_signo = 0; - curthread->data.sigwaitinfo = &siginfo; - SIGFILLSET(curthread->sigmask); - SIGSETNAND(curthread->sigmask, waitset); + waitdata.waitset = &waitset; + waitdata.siginfo = &siginfo; + curthread->data.sigwait = &waitdata; THR_SET_STATE(curthread, PS_SIGWAIT); _thr_sched_switch_unlocked(curthread); /* @@ -122,7 +122,7 @@ lib_sigtimedwait(const sigset_t *set, siginfo_t *info, * Probably unnecessary, but since it's in a union struct * we don't know how it could be used in the future. */ - curthread->data.sigwaitinfo = NULL; + curthread->data.sigwait = NULL; OUT: if (ret > 0 && info != NULL) |
