aboutsummaryrefslogtreecommitdiff
path: root/sys/nfsserver/nfs.h
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>1999-09-29 15:03:48 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>1999-09-29 15:03:48 +0000
commit2c42a1460203c03abbbcefec9fc4d720423a36f9 (patch)
tree381e6b5ab51db8d6e49358c49b2d286128beae2c /sys/nfsserver/nfs.h
parentda3605dbea3a43379cf48fee6da798d01478c27f (diff)
downloadsrc-2c42a1460203c03abbbcefec9fc4d720423a36f9.tar.gz
src-2c42a1460203c03abbbcefec9fc4d720423a36f9.zip
sigset_t change (part 2 of 5)
----------------------------- The core of the signalling code has been rewritten to operate on the new sigset_t. No methodological changes have been made. Most references to a sigset_t object are through macros (see signalvar.h) to create a level of abstraction and to provide a basis for further improvements. The NSIG constant has not been changed to reflect the maximum number of signals possible. The reason is that it breaks programs (especially shells) which assume that all signals have a non-null name in sys_signame. See src/bin/sh/trap.c for an example. Instead _SIG_MAXSIG has been introduced to hold the maximum signal possible with the new sigset_t. struct sigprop has been moved from signalvar.h to kern_sig.c because a) it is only used there, and b) access must be done though function sigprop(). The latter because the table doesn't holds properties for all signals, but only for the first NSIG signals. signal.h has been reorganized to make reading easier and to add the new and/or modified structures. The "old" structures are moved to signalvar.h to prevent namespace polution. Especially the coda filesystem suffers from the change, because it contained lines like (p->p_sigmask == SIGIO), which is easy to do for integral types, but not for compound types. NOTE: kdump (and port linux_kdump) must be recompiled. Thanks to Garrett Wollman and Daniel Eischen for pressing the importance of changing sigreturn as well.
Notes
Notes: svn path=/head/; revision=51791
Diffstat (limited to 'sys/nfsserver/nfs.h')
-rw-r--r--sys/nfsserver/nfs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index efdb6075aed7..296e34fe7f07 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -326,8 +326,10 @@ struct uio; struct buf; struct vattr; struct nameidata; /* XXX */
* such as SIGALRM will not expect file I/O system calls to be interrupted
* by them and break.
*/
-#define NFSINT_SIGMASK (sigmask(SIGINT)|sigmask(SIGTERM)|sigmask(SIGKILL)| \
- sigmask(SIGHUP)|sigmask(SIGQUIT))
+#define NFSINT_SIGMASK(set) \
+ (SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) || \
+ SIGISMEMBER(set, SIGHUP) || SIGISMEMBER(set, SIGKILL) || \
+ SIGISMEMBER(set, SIGQUIT))
/*
* Socket errors ignored for connectionless sockets??