diff options
| author | Rob Pierce <rob@cvs.openbsd.org> | 2022-02-25 18:05:50 +0000 |
|---|---|---|
| committer | Rob Pierce <rob@cvs.openbsd.org> | 2022-02-25 18:05:50 +0000 |
| commit | 1681b5b233d017fc92e894428c91ba78a8076c70 (patch) | |
| tree | ad5fe9cd02c79d3fb5027e9649f141a074d87ca7 | |
| parent | 047ea888a0d24528ab54715f7ccff7b3350d7974 (diff) | |
A few additional changes related to the now 32 bit accounting flag.
Pointers from and discussions with millert and deraadt.
Ok millert@, deraadt@, bluhm@
| -rw-r--r-- | bin/ps/keyword.c | 4 | ||||
| -rw-r--r-- | sys/sys/proc.h | 4 | ||||
| -rw-r--r-- | sys/sys/sysctl.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index f27a12b7054..4ec98733594 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.51 2022/02/22 17:42:52 millert Exp $ */ +/* $OpenBSD: keyword.c,v 1.52 2022/02/25 18:05:49 rob Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -89,7 +89,7 @@ int utime(), stime(), ixrss(), idrss(), isrss(); VAR var[] = { {"%cpu", "%CPU", NULL, NLIST, pcpu, 4}, {"%mem", "%MEM", NULL, NLIST, pmem, 4}, - {"acflag", "ACFLG", NULL, 0, pvar, 3, 0, POFF(p_acflag), UINT16, "x"}, + {"acflag", "ACFLG", NULL, 0, pvar, 3, 0, POFF(p_acflag), UINT32, "x"}, {"acflg", "", "acflag"}, {"args", "", "command"}, {"blocked", "", "sigmask"}, diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 6b9ade9c5db..51e0ea853fd 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.327 2022/02/22 17:14:14 deraadt Exp $ */ +/* $OpenBSD: proc.h,v 1.328 2022/02/25 18:05:49 rob Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -229,7 +229,7 @@ struct process { u_int pr_scale; /* pc scaling */ } ps_prof; - u_short ps_acflag; /* Accounting flags. */ + u_int32_t ps_acflag; /* Accounting flags. */ uint64_t ps_pledge; uint64_t ps_execpledge; diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index b29c62c2b21..18ec56b4081 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.226 2022/02/22 17:05:51 deraadt Exp $ */ +/* $OpenBSD: sysctl.h,v 1.227 2022/02/25 18:05:49 rob Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -433,7 +433,7 @@ struct kinfo_proc { u_int8_t p_nice; /* U_CHAR: Process "nice" value. */ u_int16_t p_xstat; /* U_SHORT: Exit status for wait; also stop signal. */ - u_int16_t p_acflag; /* U_SHORT: Accounting flags. */ + u_int16_t p_spare; /* U_SHORT: unused */ char p_comm[KI_MAXCOMLEN]; @@ -475,7 +475,7 @@ struct kinfo_proc { u_int32_t p_uctime_sec; /* STRUCT TIMEVAL: child u+s time. */ u_int32_t p_uctime_usec; /* STRUCT TIMEVAL: child u+s time. */ u_int32_t p_psflags; /* UINT: PS_* flags on the process. */ - int32_t p_spare; /* INT: unused. */ + u_int32_t p_acflag; /* UINT: Accounting flags. */ u_int32_t p_svuid; /* UID_T: saved user id */ u_int32_t p_svgid; /* GID_T: saved group id */ char p_emul[KI_EMULNAMELEN]; /* syscall emulation name */ |