diff options
Diffstat (limited to 'bin/ps/keyword.c')
-rw-r--r-- | bin/ps/keyword.c | 65 |
1 files changed, 27 insertions, 38 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index de87d40..4fbd98f 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -71,8 +71,7 @@ int utime(), stime(), ixrss(), idrss(), isrss(); #endif /* Compute offset in common structures. */ -#define POFF(x) offsetof(struct proc, x) -#define EOFF(x) offsetof(struct eproc, x) +#define KOFF(x) offsetof(struct kinfo_proc, x) #define UOFF(x) offsetof(struct usave, x) #define ROFF(x) offsetof(struct rusage, x) @@ -86,24 +85,22 @@ VAR var[] = { {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4}, {"acflag", "ACFLG", - NULL, 0, pvar, NULL, 3, POFF(p_acflag), USHORT, "x"}, + NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT, "x"}, {"acflg", "", "acflag"}, {"blocked", "", "sigmask"}, {"caught", "", "sigcatch"}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16}, - {"cpu", "CPU", NULL, 0, pvar, NULL, 3, POFF(p_estcpu), UINT, "d"}, + {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d"}, {"cputime", "", "time"}, - {"f", "F", NULL, 0, pvar, NULL, 7, POFF(p_flag), INT, "x"}, + {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x"}, {"flags", "", "f"}, {"ignored", "", "sigignore"}, {"inblk", "INBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_inblock), LONG, "ld"}, {"inblock", "", "inblk"}, - {"jobc", "JOBC", NULL, 0, evar, NULL, 4, EOFF(e_jobc), SHORT, "d"}, + {"jobc", "JOBC", NULL, 0, kvar, NULL, 4, KOFF(ki_jobc), SHORT, "d"}, {"ktrace", "KTRACE", - NULL, 0, pvar, NULL, 8, POFF(p_traceflag), INT, "x"}, - {"ktracep", "KTRACEP", - NULL, 0, pvar, NULL, 8, POFF(p_tracep), LONG, "lx"}, + NULL, 0, kvar, NULL, 8, KOFF(ki_traceflag), INT, "x"}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5}, {"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1}, {"logname", "", "login"}, @@ -118,7 +115,7 @@ VAR var[] = { {"msgsnd", "MSGSND", NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "ld"}, {"ni", "", "nice"}, - {"nice", "NI", NULL, 0, pvar, NULL, 2, POFF(p_nice), CHAR, "d"}, + {"nice", "NI", NULL, 0, kvar, NULL, 2, KOFF(ki_nice), CHAR, "d"}, {"nivcsw", "NIVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nivcsw), LONG, "ld"}, {"nsignals", "", "nsigs"}, @@ -128,68 +125,60 @@ VAR var[] = { NULL, USER, rvar, NULL, 4, ROFF(ru_nswap), LONG, "ld"}, {"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "ld"}, - {"nwchan", "WCHAN", NULL, 0, pvar, NULL, 6, POFF(p_wchan), KPTR, "lx"}, + {"nwchan", "WCHAN", NULL, 0, kvar, NULL, 6, KOFF(ki_wchan), KPTR, "lx"}, {"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "ld"}, {"oublock", "", "oublk"}, - {"p_ru", "P_RU", NULL, 0, pvar, NULL, 6, POFF(p_ru), KPTR, "lx"}, - {"paddr", "PADDR", NULL, 0, evar, NULL, 6, EOFF(e_paddr), KPTR, "lx"}, + {"paddr", "PADDR", NULL, 0, kvar, NULL, 6, KOFF(ki_paddr), KPTR, "lx"}, {"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6}, {"pcpu", "", "%cpu"}, {"pending", "", "sig"}, {"pgid", "PGID", - NULL, 0, evar, NULL, PIDLEN, EOFF(e_pgid), UINT, PIDFMT}, - {"pid", "PID", NULL, 0, pvar, NULL, PIDLEN, POFF(p_pid), UINT, PIDFMT}, + NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_pgid), UINT, PIDFMT}, + {"pid", "PID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_pid), UINT, PIDFMT}, {"pmem", "", "%mem"}, {"ppid", "PPID", - NULL, 0, evar, NULL, PIDLEN, EOFF(e_ppid), UINT, PIDFMT}, + NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_ppid), UINT, PIDFMT}, {"pri", "PRI", NULL, 0, pri, NULL, 3}, - {"re", "RE", NULL, 0, pvar, NULL, 3, POFF(p_swtime), UINT, "d"}, - {"rgid", "RGID", NULL, 0, evar, NULL, UIDLEN, EOFF(e_pcred.p_rgid), + {"re", "RE", NULL, 0, kvar, NULL, 3, KOFF(ki_swtime), UINT, "d"}, + {"rgid", "RGID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_rgid), UINT, UIDFMT}, - {"rlink", "RLINK", - NULL, 0, pvar, NULL, 8, POFF(p_procq.tqe_prev), KPTR, "lx"}, - {"rss", "RSS", NULL, 0, p_rssize, NULL, 4}, - {"rssize", "", "rsz"}, - {"rsz", "RSZ", NULL, 0, rssize, NULL, 4}, - {"rtprio", "RTPRIO", NULL, 0, rtprior, NULL, 7, POFF(p_rtprio)}, - {"ruid", "RUID", NULL, 0, evar, NULL, UIDLEN, EOFF(e_pcred.p_ruid), + {"rtprio", "RTPRIO", NULL, 0, rtprior, NULL, 7, KOFF(ki_rtprio)}, + {"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid), UINT, UIDFMT}, {"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN}, - {"sess", "SESS", NULL, 0, evar, NULL, 6, EOFF(e_sess), KPTR, "lx"}, - {"sig", "PENDING", NULL, 0, pvar, NULL, 8, POFF(p_siglist), INT, "x"}, + {"sig", "PENDING", NULL, 0, kvar, NULL, 8, KOFF(ki_siglist), INT, "x"}, {"sigcatch", "CAUGHT", - NULL, 0, evar, NULL, 8, EOFF(e_procsig.ps_sigcatch), UINT, "x"}, + NULL, 0, kvar, NULL, 8, KOFF(ki_sigcatch), UINT, "x"}, {"sigignore", "IGNORED", - NULL, 0, evar, NULL, 8, EOFF(e_procsig.ps_sigignore), UINT, "x"}, + NULL, 0, kvar, NULL, 8, KOFF(ki_sigignore), UINT, "x"}, {"sigmask", "BLOCKED", - NULL, 0, pvar, NULL, 8, POFF(p_sigmask), UINT, "x"}, - {"sl", "SL", NULL, 0, pvar, NULL, 3, POFF(p_slptime), UINT, "d"}, + NULL, 0, kvar, NULL, 8, KOFF(ki_sigmask), UINT, "x"}, + {"sl", "SL", NULL, 0, kvar, NULL, 3, KOFF(ki_slptime), UINT, "d"}, {"start", "STARTED", NULL, LJUST|USER, started, NULL, 7}, {"stat", "", "state"}, {"state", "STAT", NULL, 0, state, NULL, 4}, {"svgid", "SVGID", NULL, 0, - evar, NULL, UIDLEN, EOFF(e_pcred.p_svgid), UINT, UIDFMT}, + kvar, NULL, UIDLEN, KOFF(ki_svgid), UINT, UIDFMT}, {"svuid", "SVUID", NULL, 0, - evar, NULL, UIDLEN, EOFF(e_pcred.p_svuid), UINT, UIDFMT}, + kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4}, {"time", "TIME", NULL, USER, cputime, NULL, 9}, {"tpgid", "TPGID", - NULL, 0, evar, NULL, 4, EOFF(e_tpgid), UINT, PIDFMT}, - {"tsess", "TSESS", NULL, 0, evar, NULL, 6, EOFF(e_tsess), KPTR, "lx"}, + NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT}, {"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4}, {"tt", "TT ", NULL, 0, tname, NULL, 4}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8}, {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN}, - {"uid", "UID", NULL, 0, evar, NULL, UIDLEN, EOFF(e_ucred.cr_uid), + {"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT, UIDFMT}, - {"upr", "UPR", NULL, 0, pvar, NULL, 3, POFF(p_usrpri), CHAR, "d"}, + {"upr", "UPR", NULL, 0, kvar, NULL, 3, KOFF(ki_usrpri), CHAR, "d"}, {"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN}, {"usrpri", "", "upr"}, {"vsize", "", "vsz"}, {"vsz", "VSZ", NULL, 0, vsize, NULL, 5}, {"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6}, - {"xstat", "XSTAT", NULL, 0, pvar, NULL, 4, POFF(p_xstat), USHORT, "x"}, + {"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT, "x"}, {""}, }; |