Re-apply rev 1.178 -- style(9) the structure definitions.
I have to wonder how many other changes were lost in the KSE mildstone 2 merge.
This commit is contained in:
parent
bce9841972
commit
2af8d76dad
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=83421
@ -197,7 +197,7 @@ struct ata_cmd {
|
||||
struct {
|
||||
int mode[2];
|
||||
} mode;
|
||||
struct {
|
||||
struct {
|
||||
int type[2];
|
||||
char name[2][32];
|
||||
struct ata_params params[2];
|
||||
|
@ -166,7 +166,7 @@ struct disklabel {
|
||||
u_int16_t d_npartitions; /* number of partitions in following */
|
||||
u_int32_t d_bbsize; /* size of boot area at sn0, bytes */
|
||||
u_int32_t d_sbsize; /* max size of fs superblock, bytes */
|
||||
struct partition { /* the partition table */
|
||||
struct partition { /* the partition table */
|
||||
u_int32_t p_size; /* number of sectors in partition */
|
||||
u_int32_t p_offset; /* starting sector */
|
||||
u_int32_t p_fsize; /* filesystem basic fragment size */
|
||||
|
@ -166,7 +166,7 @@ struct disklabel {
|
||||
u_int16_t d_npartitions; /* number of partitions in following */
|
||||
u_int32_t d_bbsize; /* size of boot area at sn0, bytes */
|
||||
u_int32_t d_sbsize; /* max size of fs superblock, bytes */
|
||||
struct partition { /* the partition table */
|
||||
struct partition { /* the partition table */
|
||||
u_int32_t p_size; /* number of sectors in partition */
|
||||
u_int32_t p_offset; /* starting sector */
|
||||
u_int32_t p_fsize; /* filesystem basic fragment size */
|
||||
|
@ -166,7 +166,7 @@ struct disklabel {
|
||||
u_int16_t d_npartitions; /* number of partitions in following */
|
||||
u_int32_t d_bbsize; /* size of boot area at sn0, bytes */
|
||||
u_int32_t d_sbsize; /* max size of fs superblock, bytes */
|
||||
struct partition { /* the partition table */
|
||||
struct partition { /* the partition table */
|
||||
u_int32_t p_size; /* number of sectors in partition */
|
||||
u_int32_t p_offset; /* starting sector */
|
||||
u_int32_t p_fsize; /* filesystem basic fragment size */
|
||||
|
@ -66,7 +66,7 @@ struct file {
|
||||
int f_count; /* reference count */
|
||||
int f_msgcount; /* references from message queue */
|
||||
struct ucred *f_cred; /* credentials associated with descriptor */
|
||||
struct fileops {
|
||||
struct fileops {
|
||||
int (*fo_read) __P((struct file *fp, struct uio *uio,
|
||||
struct ucred *cred, int flags,
|
||||
struct thread *td));
|
||||
|
@ -232,7 +232,7 @@ They would be given priorities calculated from the KSEG.
|
||||
* The first KSE available in the correct group will run this thread.
|
||||
* If several are available, use the one on the same CPU as last time.
|
||||
*/
|
||||
struct thread {
|
||||
struct thread {
|
||||
struct proc *td_proc; /* Associated process. */
|
||||
struct ksegrp *td_ksegrp; /* Associated KSEG. */
|
||||
struct kse *td_last_kse; /* Where it wants to be if possible */
|
||||
@ -281,7 +281,7 @@ struct thread {
|
||||
* with a KSEG that contains the priority and niceness
|
||||
* for the group.
|
||||
*/
|
||||
struct kse {
|
||||
struct kse {
|
||||
struct proc *ke_proc; /* Associated process. */
|
||||
struct ksegrp *ke_ksegrp; /* Associated KSEG. */
|
||||
struct thread *ke_thread; /* Associated thread, if running. */
|
||||
@ -319,7 +319,7 @@ struct kse {
|
||||
* be an indivisible unit from a time-sharing perspective, though each KSEG may
|
||||
* contain multiple KSEs.
|
||||
*/
|
||||
struct ksegrp {
|
||||
struct ksegrp {
|
||||
struct proc *kg_proc; /* Process that contains this KSEG. */
|
||||
TAILQ_ENTRY(ksegrp) kg_ksegrp; /* Queue of KSEGs in kg_proc. */
|
||||
TAILQ_HEAD(, kse) kg_kseq; /* (ke_kglist) All KSEs */
|
||||
@ -349,7 +349,7 @@ struct ksegrp {
|
||||
* The old fashionned process. May have multiple threads, KSEGRPs
|
||||
* and KSEs. Starts off with a single embedded KSEGRP, KSE and THREAD.
|
||||
*/
|
||||
struct proc {
|
||||
struct proc {
|
||||
LIST_ENTRY(proc) p_list; /* (d) List of all processes. */
|
||||
TAILQ_HEAD(, ksegrp) p_ksegrps; /* (kg_ksegrp) All KSEGs. */
|
||||
TAILQ_HEAD(, thread) p_threads; /* (td_plist) threads. (shortcut) */
|
||||
|
@ -86,7 +86,7 @@ struct socket {
|
||||
/*
|
||||
* Variables for socket buffering.
|
||||
*/
|
||||
struct sockbuf {
|
||||
struct sockbuf {
|
||||
u_long sb_cc; /* actual chars in buffer */
|
||||
u_long sb_hiwat; /* max actual char count */
|
||||
u_long sb_mbcnt; /* chars of mbufs used */
|
||||
@ -114,7 +114,7 @@ struct socket {
|
||||
/* NB: generation count must not be first; easiest to make it last. */
|
||||
so_gen_t so_gencnt; /* generation count */
|
||||
void *so_emuldata; /* private data for emulators */
|
||||
struct so_accf {
|
||||
struct so_accf {
|
||||
struct accept_filter *so_accept_filter;
|
||||
void *so_accept_filter_arg; /* saved filter args */
|
||||
char *so_accept_filter_str; /* saved user args */
|
||||
@ -160,7 +160,7 @@ struct xsocket {
|
||||
u_short so_error;
|
||||
pid_t so_pgid;
|
||||
u_long so_oobmark;
|
||||
struct xsockbuf {
|
||||
struct xsockbuf {
|
||||
u_long sb_cc;
|
||||
u_long sb_hiwat;
|
||||
u_long sb_mbcnt;
|
||||
|
@ -180,7 +180,7 @@ void fill_kinfo_proc __P((struct proc *, struct kinfo_proc *));
|
||||
* in all processes.
|
||||
*/
|
||||
|
||||
struct user {
|
||||
struct user {
|
||||
struct sigacts u_sigacts; /* *p_sigacts */
|
||||
struct pstats u_stats; /* *p_stats */
|
||||
/*
|
||||
|
@ -129,7 +129,7 @@ struct vnode {
|
||||
TAILQ_HEAD(, namecache) v_cache_dst; /* Cache entries to us */
|
||||
struct vnode *v_dd; /* .. vnode */
|
||||
u_long v_ddid; /* .. capability identifier */
|
||||
struct {
|
||||
struct {
|
||||
struct mtx vpi_lock; /* lock to protect below */
|
||||
struct selinfo vpi_selinfo; /* identity of poller(s) */
|
||||
short vpi_events; /* what they are looking for */
|
||||
|
Loading…
Reference in New Issue
Block a user