Cosmetics. related to getting prototypes into view.

This commit is contained in:
Poul-Henning Kamp 1994-10-10 01:00:49 +00:00
parent 3d05297c86
commit d93f860c60
5 changed files with 64 additions and 58 deletions

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94
* $Id: kern_fork.c,v 1.7 1994/10/02 04:45:47 davidg Exp $ * $Id: kern_fork.c,v 1.8 1994/10/09 07:34:55 davidg Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -51,6 +51,8 @@
#include <sys/acct.h> #include <sys/acct.h>
#include <sys/ktrace.h> #include <sys/ktrace.h>
#include <vm/vm.h>
static int fork1(struct proc *, int, int *); static int fork1(struct proc *, int, int *);
struct fork_args { struct fork_args {

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)kern_proc.c 8.4 (Berkeley) 1/4/94 * @(#)kern_proc.c 8.4 (Berkeley) 1/4/94
* $Id: kern_proc.c,v 1.7 1994/10/02 04:45:48 davidg Exp $ * $Id: kern_proc.c,v 1.8 1994/10/09 07:34:57 davidg Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -58,7 +58,6 @@ volatile struct proc *allproc; /* all processes */
struct proc *zombproc; /* just zombies */ struct proc *zombproc; /* just zombies */
void pgdelete __P((struct pgrp *)); void pgdelete __P((struct pgrp *));
void fixjobc __P((struct proc *, struct pgrp *, int));
/* /*
* Structure associated with user cacheing. * Structure associated with user cacheing.

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94
* $Id: kern_resource.c,v 1.5 1994/09/25 19:33:42 phk Exp $ * $Id: kern_resource.c,v 1.6 1994/10/02 04:45:49 davidg Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -49,6 +49,9 @@
#include <vm/vm.h> #include <vm/vm.h>
int donice __P((struct proc *, struct proc *, int));
int dosetrlimit __P((struct proc *, u_int, struct rlimit *));
/* /*
* Resource controls and accounting. * Resource controls and accounting.
*/ */

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94
* $Id: kern_sig.c,v 1.5 1994/09/25 19:33:43 phk Exp $ * $Id: kern_sig.c,v 1.6 1994/09/30 00:38:34 ache Exp $
*/ */
#define SIGPROP /* include signal properties table */ #define SIGPROP /* include signal properties table */
@ -495,6 +495,56 @@ sigaltstack(p, uap, retval)
return (0); return (0);
} }
/*
* Common code for kill process group/broadcast kill.
* cp is calling process.
*/
int
killpg1(cp, signum, pgid, all)
register struct proc *cp;
int signum, pgid, all;
{
register struct proc *p;
register struct pcred *pc = cp->p_cred;
struct pgrp *pgrp;
int nfound = 0;
if (all)
/*
* broadcast
*/
for (p = (struct proc *)allproc; p != NULL; p = p->p_next) {
if (p->p_pid <= 1 || p->p_flag & P_SYSTEM ||
p == cp || !CANSIGNAL(cp, pc, p, signum))
continue;
nfound++;
if (signum)
psignal(p, signum);
}
else {
if (pgid == 0)
/*
* zero pgid means send to my process group.
*/
pgrp = cp->p_pgrp;
else {
pgrp = pgfind(pgid);
if (pgrp == NULL)
return (ESRCH);
}
for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
if (p->p_pid <= 1 || p->p_flag & P_SYSTEM ||
p->p_stat == SZOMB ||
!CANSIGNAL(cp, pc, p, signum))
continue;
nfound++;
if (signum)
psignal(p, signum);
}
}
return (nfound ? 0 : ESRCH);
}
struct kill_args { struct kill_args {
int pid; int pid;
int signum; int signum;
@ -551,56 +601,6 @@ okillpg(p, uap, retval)
} }
#endif /* COMPAT_43 || COMPAT_SUNOS */ #endif /* COMPAT_43 || COMPAT_SUNOS */
/*
* Common code for kill process group/broadcast kill.
* cp is calling process.
*/
int
killpg1(cp, signum, pgid, all)
register struct proc *cp;
int signum, pgid, all;
{
register struct proc *p;
register struct pcred *pc = cp->p_cred;
struct pgrp *pgrp;
int nfound = 0;
if (all)
/*
* broadcast
*/
for (p = (struct proc *)allproc; p != NULL; p = p->p_next) {
if (p->p_pid <= 1 || p->p_flag & P_SYSTEM ||
p == cp || !CANSIGNAL(cp, pc, p, signum))
continue;
nfound++;
if (signum)
psignal(p, signum);
}
else {
if (pgid == 0)
/*
* zero pgid means send to my process group.
*/
pgrp = cp->p_pgrp;
else {
pgrp = pgfind(pgid);
if (pgrp == NULL)
return (ESRCH);
}
for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
if (p->p_pid <= 1 || p->p_flag & P_SYSTEM ||
p->p_stat == SZOMB ||
!CANSIGNAL(cp, pc, p, signum))
continue;
nfound++;
if (signum)
psignal(p, signum);
}
}
return (nfound ? 0 : ESRCH);
}
/* /*
* Send a signal to a process group. * Send a signal to a process group.
*/ */
@ -962,8 +962,8 @@ issignal(p)
* Are you sure you want to ignore SIGSEGV * Are you sure you want to ignore SIGSEGV
* in init? XXX * in init? XXX
*/ */
printf("Process (pid %d) got signal %d\n", printf("Process (pid %lu) got signal %d\n",
p->p_pid, signum); (u_long)p->p_pid, signum);
#endif #endif
break; /* == ignore */ break; /* == ignore */
} }

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94
* $Id: sys_generic.c,v 1.6 1994/09/25 19:33:48 phk Exp $ * $Id: sys_generic.c,v 1.7 1994/10/02 17:35:24 phk Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -58,6 +58,8 @@
#endif #endif
#include <vm/vm.h> #include <vm/vm.h>
int selscan __P((struct proc *, fd_set *, fd_set *, int, int *));
/* /*
* Read system call. * Read system call.
*/ */