diff options
Diffstat (limited to 'sys/sys/proc.h')
| -rw-r--r-- | sys/sys/proc.h | 55 |
1 files changed, 4 insertions, 51 deletions
diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 1b7d5ad157107..2a7a7a39f5b27 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $Id: proc.h,v 1.65 1998/12/31 13:23:16 bde Exp $ + * $Id: proc.h,v 1.57 1998/04/04 13:26:14 phk Exp $ */ #ifndef _SYS_PROC_H_ @@ -47,15 +47,11 @@ #include <sys/rtprio.h> /* For struct rtprio. */ #include <sys/select.h> /* For struct selinfo. */ #include <sys/signal.h> -#ifdef COMPAT_LINUX_THREADS -#include <sys/signalvar.h> -#endif /* COMPAT_LINUX_THREADS */ #ifndef KERNEL #include <sys/time.h> /* For structs itimerval, timeval. */ #endif #include <sys/ucred.h> #include <sys/queue.h> -#include <sys/filedesc.h> /* * One structure allocated per session. @@ -65,7 +61,6 @@ struct session { struct proc *s_leader; /* Session leader. */ struct vnode *s_ttyvp; /* Vnode of controlling terminal. */ struct tty *s_ttyp; /* Controlling terminal. */ - pid_t s_sid; /* Session ID */ char s_login[roundup(MAXLOGNAME, sizeof(long))]; /* Setlogin() name. */ }; @@ -76,32 +71,10 @@ 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. */ - struct sigiolst pg_sigiolst; /* List of sigio sources. */ pid_t pg_id; /* Pgrp id. */ int pg_jobc; /* # procs qualifying pgrp for job control */ }; -#ifdef COMPAT_LINUX_THREADS -struct procsig { -#define ps_begincopy ps_sigignore - sigset_t ps_sigignore; /* Signals being ignored. */ - sigset_t ps_sigcatch; /* Signals being caught by user. */ - int ps_flag; - struct sigacts *ps_sigacts; -#define ps_endcopy ps_refcnt - int ps_refcnt; -}; -#endif /* COMPAT_LINUX_THREADS */ - -/* - * pasleep structure, used by asleep() syscall to hold requested priority - * and timeout values for await(). - */ -struct pasleep { - int as_priority; /* Async priority. */ - int as_timo; /* Async timeout. */ -}; - /* * Description of a process. * @@ -123,14 +96,7 @@ struct proc { struct pstats *p_stats; /* Accounting/statistics (PROC ONLY). */ struct plimit *p_limit; /* Process limits. */ struct vm_object *p_upages_obj;/* Upages object */ -#ifndef COMPAT_LINUX_THREADS struct sigacts *p_sigacts; /* Signal actions, state (PROC ONLY). */ -#else - struct procsig *p_procsig; -#define p_sigacts p_procsig->ps_sigacts -#define p_sigignore p_procsig->ps_sigignore -#define p_sigcatch p_procsig->ps_sigcatch -#endif #define p_ucred p_cred->pc_ucred #define p_rlimit p_limit->pl_rlimit @@ -194,13 +160,6 @@ struct proc { unsigned char p_pfsflags; /* procfs flags */ char p_pad3[2]; /* padding for alignment */ register_t p_retval[2]; /* syscall aux returns */ - struct sigiolst p_sigiolst; /* list of sigio sources */ -#ifdef COMPAT_LINUX_THREADS - int p_sigparent; /* signal to parent on exit */ - sigset_t p_oldsigmask; /* saved mask from before sigpause */ - int p_sig; /* for core dump/debugger XXX */ - u_long p_code; /* for core dump/debugger XXX */ -#endif /* COMPAT_LINUX_THREADS */ /* End area that is zeroed on creation. */ #define p_endzero p_startcopy @@ -209,10 +168,9 @@ struct proc { #define p_startcopy p_sigmask sigset_t p_sigmask; /* Current signal mask. */ -#ifndef COMPAT_LINUX_THREADS sigset_t p_sigignore; /* Signals being ignored. */ sigset_t p_sigcatch; /* Signals being caught by user. */ -#endif /* COMPAT_LINUX_THREADS */ + u_char p_priority; /* Process priority. */ u_char p_usrpri; /* User-priority based on p_cpu and p_nice. */ char p_nice; /* Process "nice" value. */ @@ -237,7 +195,6 @@ struct proc { int p_wakeup; /* thread id */ struct proc *p_peers; struct proc *p_leader; - struct pasleep p_asleep; /* Used by asleep()/await(). */ }; #define p_session p_pgrp->pg_session @@ -310,8 +267,8 @@ MALLOC_DECLARE(M_SUBPROC); * We use process IDs <= PID_MAX; PID_MAX + 1 must also fit in a pid_t, * as it is used to represent "no process group". */ -#define PID_MAX 99999 -#define NO_PID 100000 +#define PID_MAX 30000 +#define NO_PID 30001 #define SESS_LEADER(p) ((p)->p_session->s_leader == (p)) #define SESSHOLD(s) ((s)->s_count++) @@ -388,11 +345,7 @@ void wakeup_one __P((void *chan)); void cpu_exit __P((struct proc *)) __dead2; void exit1 __P((struct proc *, int)) __dead2; void cpu_fork __P((struct proc *, struct proc *)); -#ifndef COMPAT_LINUX_THREADS int fork1 __P((struct proc *, int)); -#else -int fork1 __P((struct proc *, int)); -#endif /* COMPAT_LINUX_THREADS */ int trace_req __P((struct proc *)); void cpu_wait __P((struct proc *)); int cpu_coredump __P((struct proc *, struct vnode *, struct ucred *)); |