Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/sys convert to ANSI KNF
details: https://anonhg.NetBSD.org/src/rev/0dc655782e91
branches: trunk
changeset: 504281:0dc655782e91
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Feb 26 16:24:02 2001 +0000
description:
convert to ANSI KNF
diffstat:
sys/sys/proc.h | 427 +++++++++++++++++++++++++++------------------------
sys/sys/select.h | 12 +-
sys/sys/socketvar.h | 298 ++++++++++++++++++-----------------
3 files changed, 380 insertions(+), 357 deletions(-)
diffs (truncated from 1020 to 300 lines):
diff -r ffd237d5a340 -r 0dc655782e91 sys/sys/proc.h
--- a/sys/sys/proc.h Mon Feb 26 16:07:58 2001 +0000
+++ b/sys/sys/proc.h Mon Feb 26 16:24:02 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.121 2001/01/25 20:18:51 jdolecek Exp $ */
+/* $NetBSD: proc.h,v 1.122 2001/02/26 16:32:48 lukem Exp $ */
/*-
* Copyright (c) 1986, 1989, 1991, 1993
@@ -50,7 +50,7 @@
#if defined(_KERNEL)
#include <machine/cpu.h> /* curcpu() and cpu_info */
#endif
-#include <machine/proc.h> /* Machine-dependent proc substruct. */
+#include <machine/proc.h> /* Machine-dependent proc substruct */
#include <sys/lock.h>
#include <sys/queue.h>
#include <sys/callout.h>
@@ -59,24 +59,27 @@
/*
* One structure allocated per session.
*/
-struct session {
- int s_count; /* Ref cnt; pgrps in session. */
- struct proc *s_leader; /* Session leader. */
- struct vnode *s_ttyvp; /* Vnode of controlling terminal. */
- struct tty *s_ttyp; /* Controlling terminal. */
- char s_login[MAXLOGNAME]; /* Setlogin() name. */
- pid_t s_sid; /* session ID (pid of leader) */
+struct session {
+ int s_count; /* Ref cnt; pgrps in session */
+ struct proc *s_leader; /* Session leader */
+ struct vnode *s_ttyvp; /* Vnode of controlling terminal */
+ struct tty *s_ttyp; /* Controlling terminal */
+ char s_login[MAXLOGNAME]; /* Setlogin() name */
+ pid_t s_sid; /* Session ID (pid of leader) */
};
/*
* One structure allocated per process group.
*/
-struct pgrp {
- LIST_ENTRY(pgrp) pg_hash; /* Hash chain. */
- LIST_HEAD(, proc) pg_members; /* Pointer to pgrp members. */
- struct session *pg_session; /* Pointer to session. */
- pid_t pg_id; /* Pgrp id. */
- int pg_jobc; /* # procs qualifying pgrp for job control */
+struct pgrp {
+ LIST_ENTRY(pgrp) pg_hash; /* Hash chain */
+ LIST_HEAD(, proc) pg_members; /* Pointer to pgrp members */
+ struct session *pg_session; /* Pointer to session */
+ pid_t pg_id; /* Pgrp id */
+ int pg_jobc; /*
+ * Number of processes qualifying
+ * pgrp for job control
+ */
};
/*
@@ -85,36 +88,38 @@
struct exec_package;
struct ps_strings;
-struct emul {
- const char *e_name; /* Symbolic name */
- const char *e_path; /* Extra emulation path (NULL if none)*/
+struct emul {
+ const char *e_name; /* Symbolic name */
+ const char *e_path; /* Extra emulation path (NULL if none)*/
#ifndef __HAVE_MINIMAL_EMUL
- int e_flags; /* Miscellaneous flags */
+ int e_flags; /* Miscellaneous flags */
/* Syscall handling function */
- const int *e_errno; /* Errno array */
- int e_nosys; /* Offset of the nosys() syscall */
- int e_nsysent; /* Number of system call entries */
+ const int *e_errno; /* Errno array */
+ int e_nosys; /* Offset of the nosys() syscall */
+ int e_nsysent; /* Number of system call entries */
#endif
const struct sysent *e_sysent; /* System call array */
- const char * const *e_syscallnames; /* System call name array */
+ const char * const *e_syscallnames; /* System call name array */
/* Signal sending function */
- void (*e_sendsig) __P((sig_t, int, sigset_t *, u_long));
- char *e_sigcode; /* Start of sigcode */
- char *e_esigcode; /* End of sigcode */
+ void (*e_sendsig) __P((sig_t, int, sigset_t *, u_long));
+ char *e_sigcode; /* Start of sigcode */
+ char *e_esigcode; /* End of sigcode */
/* Per-process hooks */
- void (*e_proc_exec) __P((struct proc *, struct exec_package *));
- void (*e_proc_fork) __P((struct proc *p, struct proc *parent));
- void (*e_proc_exit) __P((struct proc *));
+ void (*e_proc_exec) __P((struct proc *,
+ struct exec_package *));
+ void (*e_proc_fork) __P((struct proc *p,
+ struct proc *parent));
+ void (*e_proc_exit) __P((struct proc *));
#ifdef __HAVE_SYSCALL_INTERN
- void (*e_syscall_intern) __P((struct proc *));
+ void (*e_syscall_intern) __P((struct proc *));
#else
- void (*e_syscall) __P((void));
+ void (*e_syscall) __P((void));
#endif
};
-#define EMUL_HAS_SYS___syscall 0x001 /* has SYS___syscall */
+#define EMUL_HAS_SYS___syscall 0x001 /* Has SYS___syscall */
/*
* Description of a process.
@@ -127,104 +132,114 @@
* which might be addressible only on a processor on which the process
* is running.
*/
-struct proc {
- struct proc *p_forw; /* Doubly-linked run/sleep queue. */
- struct proc *p_back;
- LIST_ENTRY(proc) p_list; /* List of all processes. */
+struct proc {
+ struct proc *p_forw; /* Doubly-linked run/sleep queue */
+ struct proc *p_back;
+ LIST_ENTRY(proc) p_list; /* List of all processes */
- /* substructures: */
- struct pcred *p_cred; /* Process owner's identity. */
- struct filedesc *p_fd; /* Ptr to open files structure. */
- struct cwdinfo *p_cwdi; /* cdir/rdir/cmask info */
- struct pstats *p_stats; /* Accounting/statistics (PROC ONLY). */
- struct plimit *p_limit; /* Process limits. */
- struct vmspace *p_vmspace; /* Address space. */
- struct sigacts *p_sigacts; /* Process sigactions (state is below)*/
+ /* Substructures: */
+ struct pcred *p_cred; /* Process owner's identity */
+ struct filedesc *p_fd; /* Ptr to open files structure */
+ struct cwdinfo *p_cwdi; /* cdir/rdir/cmask info */
+ struct pstats *p_stats; /* Accounting/statistics (PROC ONLY) */
+ struct plimit *p_limit; /* Process limits */
+ struct vmspace *p_vmspace; /* Address space */
+ struct sigacts *p_sigacts; /* Process sigactions (state is below)*/
#define p_ucred p_cred->pc_ucred
#define p_rlimit p_limit->pl_rlimit
- int p_exitsig; /* signal to sent to parent on exit */
- int p_flag; /* P_* flags. */
- struct cpu_info * __volatile p_cpu; /* CPU we're running on if
- SONPROC */
- char p_stat; /* S* process status. */
- char p_pad1[3];
+ int p_exitsig; /* Signal to sent to parent on exit */
+ int p_flag; /* P_* flags */
+ struct cpu_info * __volatile p_cpu;
+ /* CPU we're running on if SONPROC */
+ char p_stat; /* S* process status */
+ char p_pad1[3];
- pid_t p_pid; /* Process identifier. */
- LIST_ENTRY(proc) p_hash; /* Hash chain. */
- LIST_ENTRY(proc) p_pglist; /* List of processes in pgrp. */
- struct proc *p_pptr; /* Pointer to parent process. */
- LIST_ENTRY(proc) p_sibling; /* List of sibling processes. */
- LIST_HEAD(, proc) p_children; /* Pointer to list of children. */
+ pid_t p_pid; /* Process identifier */
+ LIST_ENTRY(proc) p_hash; /* Hash chain */
+ LIST_ENTRY(proc) p_pglist; /* List of processes in pgrp */
+ struct proc *p_pptr; /* Pointer to parent process */
+ LIST_ENTRY(proc) p_sibling; /* List of sibling processes */
+ LIST_HEAD(, proc) p_children; /* Pointer to list of children */
-/* The following fields are all zeroed upon creation in fork. */
+/*
+ * The following fields are all zeroed upon creation in fork.
+ */
#define p_startzero p_oppid
- pid_t p_oppid; /* Save parent pid during ptrace. XXX */
- int p_dupfd; /* Sideways return value from filedescopen. XXX */
+ pid_t p_oppid; /* Save parent pid during ptrace. XXX */
+ int p_dupfd; /* Sideways return value from filedescopen. XXX */
- /* scheduling */
- u_int p_estcpu; /* Time averaged value of p_cpticks. XXX belongs in p_startcopy section */
- int p_cpticks; /* Ticks of cpu time. */
- fixpt_t p_pctcpu; /* %cpu for this process during p_swtime */
- void *p_wchan; /* Sleep address. */
- struct callout p_tsleep_ch;/* callout for tsleep */
- const char *p_wmesg; /* Reason for sleep. */
- u_int p_swtime; /* Time swapped in or out. */
- u_int p_slptime; /* Time since last blocked. */
+ /* Scheduling */
+ u_int p_estcpu; /* Time averaged value of p_cpticks. XXX belongs in p_startcopy section */
+ int p_cpticks; /* Ticks of cpu time */
+ fixpt_t p_pctcpu; /* %cpu for this proc during p_swtime */
+ void *p_wchan; /* Sleep address */
+ struct callout p_tsleep_ch; /* Callout for tsleep */
+ const char *p_wmesg; /* Reason for sleep */
+ u_int p_swtime; /* Time swapped in or out */
+ u_int p_slptime; /* Time since last blocked */
- struct callout p_realit_ch; /* real time callout */
- struct itimerval p_realtimer; /* Alarm timer. */
- struct timeval p_rtime; /* Real time. */
- u_quad_t p_uticks; /* Statclock hits in user mode. */
- u_quad_t p_sticks; /* Statclock hits in system mode. */
- u_quad_t p_iticks; /* Statclock hits processing intr. */
+ struct callout p_realit_ch; /* Real time callout */
+ struct itimerval p_realtimer; /* Alarm timer */
+ struct timeval p_rtime; /* Real time */
+ u_quad_t p_uticks; /* Statclock hits in user mode */
+ u_quad_t p_sticks; /* Statclock hits in system mode */
+ u_quad_t p_iticks; /* Statclock hits processing intr */
- int p_traceflag; /* Kernel trace points. */
- struct file *p_tracep; /* Trace to file */
+ int p_traceflag; /* Kernel trace points */
+ struct file *p_tracep; /* Trace to file */
+
+ struct vnode *p_textvp; /* Vnode of executable */
- struct vnode *p_textvp; /* Vnode of executable. */
-
- int p_locks; /* DEBUG: lockmgr count of held locks */
+ int p_locks; /* DEBUG: lockmgr count of held locks */
- int p_holdcnt; /* If non-zero, don't swap. */
+ int p_holdcnt; /* If non-zero, don't swap */
const struct emul *p_emul; /* Emulation information */
- void *p_emuldata; /* Per-process emulation data, or NULL.
- * Malloc type M_EMULDATA */
+ void *p_emuldata; /*
+ * Per-process emulation data, or NULL.
+ * Malloc type M_EMULDATA
+ */
-/* End area that is zeroed on creation. */
+/*
+ * End area that is zeroed on creation
+ */
#define p_endzero p_startcopy
-/* The following fields are all copied upon creation in fork. */
+/*
+ * The following fields are all copied upon creation in fork.
+ */
#define p_startcopy p_sigctx.ps_startcopy
- struct sigctx p_sigctx; /* Signal state. */
+ struct sigctx p_sigctx; /* Signal state */
- u_char p_priority; /* Process priority. */
- u_char p_usrpri; /* User-priority based on p_cpu and p_nice. */
- u_char p_nice; /* Process "nice" value. */
- char p_comm[MAXCOMLEN+1];
+ u_char p_priority; /* Process priority */
+ u_char p_usrpri; /* User-priority based on p_cpu and p_nice */
+ u_char p_nice; /* Process "nice" value */
+ char p_comm[MAXCOMLEN+1];
+
+ struct pgrp *p_pgrp; /* Pointer to process group */
+ void *p_ctxlink; /* uc_link {get,set}context */
- struct pgrp *p_pgrp; /* Pointer to process group. */
- void *p_ctxlink; /* uc_link {get,set}context */
+ struct ps_strings *p_psstr; /* Address of process's ps_strings */
+ size_t p_psargv; /* Offset of ps_argvstr in above */
+ size_t p_psnargv; /* Offset of ps_nargvstr in above */
+ size_t p_psenv; /* Offset of ps_envstr in above */
+ size_t p_psnenv; /* Offset of ps_nenvstr in above */
- struct ps_strings *p_psstr; /* address of process's ps_strings */
- size_t p_psargv; /* offset of ps_argvstr in above */
- size_t p_psnargv; /* offset of ps_nargvstr in above */
- size_t p_psenv; /* offset of ps_envstr in above */
- size_t p_psnenv; /* offset of ps_nenvstr in above */
-
-/* End area that is copied on creation. */
+/*
+ * End area that is copied on creation
+ */
#define p_endcopy p_thread
- void *p_thread; /* Id for this "thread"; Mach glue. XXX */
- struct user *p_addr; /* Kernel virtual addr of u-area (PROC ONLY). */
- struct mdproc p_md; /* Any machine-dependent fields. */
+ void *p_thread; /* Id for this "thread"; Mach glue. XXX */
+ struct user *p_addr; /* Kernel virtual addr of u-area (PROC ONLY) */
+ struct mdproc p_md; /* Any machine-dependent fields */
- u_short p_xstat; /* Exit status for wait; also stop signal. */
- u_short p_acflag; /* Accounting flags. */
- struct rusage *p_ru; /* Exit information. XXX */
+ u_short p_xstat; /* Exit status for wait; also stop signal */
+ u_short p_acflag; /* Accounting flags */
+ struct rusage *p_ru; /* Exit information. XXX */
};
Home |
Main Index |
Thread Index |
Old Index