d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uninlined CURSIG() and unpolluted <sys/signalvar.h>. CURSIG() had become

Browse Source 
very bloated, first with 128-bit sigset_t's, then with locking in the
SMP case, then with locking in all cases.  The space bloat was probably
also time bloat, partly because the fast path through CURSIG() was
pessimized by the sigset_t changes.  This change speeds up lmbench's
pipe-based latency benchmark by 4% on a Celeron.  <sys/signalvar.h>
had become very polluted to support the bloat.
This commit is contained in:
bde 2000-09-17 14:28:33 +00:00
parent 0a7adf3296
commit 80d33b22bf
2 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/kern/kern_sig.c
View File

@ -67,6 +67,7 @@
#include <machine/ipl.h>
#include <machine/cpu.h>
#include <machine/mutex.h>
#include <machine/smp.h>
#define ONSIG 32 /* NSIG for osig* syscalls. XXX. */
@ -166,6 +167,31 @@ static int sigproptbl[NSIG] = {
SA_KILL, /* SIGUSR2 */
};
/*
* Determine signal that should be delivered to process p, the current
* process, 0 if none. If there is a pending stop signal with default
* action, the process stops in issignal().
*
* MP SAFE
*/
int
CURSIG(struct proc *p)
{
sigset_t tmpset;
int r;
tmpset = p->p_siglist;
SIGSETNAND(tmpset, p->p_sigmask);
if (SIGISEMPTY(p->p_siglist) ||
(!(p->p_flag & P_TRACED) && SIGISEMPTY(tmpset))) {
return(0);
}
mtx_enter(&Giant, MTX_DEF);
r = issignal(p);
mtx_exit(&Giant, MTX_DEF);
return(r);
}
static __inline int
sigprop(int sig)
{

37
sys/sys/signalvar.h
View File

@ -38,8 +38,6 @@
#define _SYS_SIGNALVAR_H_
#include <sys/signal.h>
#include <sys/proc.h>
#include <machine/smp.h>
/*
* Kernel signal definitions and data structures,
@ -189,10 +187,6 @@ __sigseteq(sigset_t *set1, sigset_t *set2)
#ifdef _KERNEL
#include <sys/ktr.h>
#include <sys/systm.h>
#include <machine/mutex.h>
struct pgrp;
struct proc;
struct sigio;
@ -202,6 +196,7 @@ extern int sugid_coredump; /* Sysctl variable kern.sugid_coredump */
/*
* Machine-independent functions:
*/
int CURSIG(struct proc *p);
void check_sigacts __P((void));
void execsigs __P((struct proc *p));
void gsignal __P((int pgid, int sig));
@ -214,42 +209,12 @@ void psignal __P((struct proc *p, int sig));
void sigexit __P((struct proc *p, int signum));
void siginit __P((struct proc *p));
void trapsignal __P((struct proc *p, int sig, u_long code));
static int __cursig __P((struct proc *p));
/*
* Machine-dependent functions:
*/
void sendsig __P((sig_t action, int sig, sigset_t *retmask, u_long code));
/*
* Inline functions:
*/
#define CURSIG(p) __cursig(p)
/*
* Determine signal that should be delivered to process p, the current
* process, 0 if none. If there is a pending stop signal with default
* action, the process stops in issignal().
*
* MP SAFE
*/
static __inline int __cursig(struct proc *p)
{
sigset_t tmpset;
int r;
tmpset = p->p_siglist;
SIGSETNAND(tmpset, p->p_sigmask);
if (SIGISEMPTY(p->p_siglist) ||
(!(p->p_flag & P_TRACED) && SIGISEMPTY(tmpset))) {
return(0);
}
mtx_enter(&Giant, MTX_DEF);
r = issignal(p);
mtx_exit(&Giant, MTX_DEF);
return(r);
}
#endif /* _KERNEL */
#endif /* !_SYS_SIGNALVAR_H_ */