From aeb7f2b6d3ecb81007ad3f655c27f0d7e5f5c1b1 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Mon, 11 Aug 1997 02:35:16 +0000 Subject: [PATCH] Remove #ifdef NEWVM code and remove extra "key.name = p" line. --- bin/ps/keyword.c | 131 +++-------------------------------------------- 1 file changed, 6 insertions(+), 125 deletions(-) diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 78bab6882ac3..64e3ba651d52 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -29,12 +29,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: keyword.c,v 1.15 1997/04/29 05:26:04 jkh Exp $ */ #ifndef lint -static char const sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; +#if 0 +static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; +#else +static const char rcsid[] = + "$Id: keyword.c,v 1.16 1997/08/11 02:29:50 steve Exp $"; +#endif #endif /* not lint */ #include @@ -52,16 +55,6 @@ static char const sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #include "ps.h" -#ifdef P_PPWAIT -#define NEWVM -#endif - -#ifdef NEWVM -#include -#include -#include -#endif - static VAR *findvar __P((char *)); static int vcmp __P((const void *, const void *)); @@ -87,7 +80,6 @@ int utime(), stime(), ixrss(), idrss(), isrss(); #define USERLEN UT_NAMESIZE VAR var[] = { -#ifdef NEWVM {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4}, {"acflag", "ACFLG", @@ -194,115 +186,6 @@ VAR var[] = { {"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"}, -#else - {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4}, - {"%mem", "%MEM", NULL, 0, pmem, NULL, 4}, - {"acflag", "ACFLG", - NULL, USER, uvar, NULL, 3, UOFF(u_acflag), SHORT, "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_cpu), ULONG, "d"}, - {"cputime", "", "time"}, - {"f", "F", NULL, 0, pvar, NULL, 7, POFF(p_flag), LONG, "x"}, - {"flags", "", "f"}, - {"ignored", "", "sigignore"}, - {"inblk", "INBLK", - NULL, USER, rvar, NULL, 4, ROFF(ru_inblock), LONG, "d"}, - {"inblock", "", "inblk"}, - {"jobc", "JOBC", NULL, 0, evar, NULL, 4, EOFF(e_jobc), SHORT, "d"}, - {"ktrace", "KTRACE", - NULL, 0, pvar, NULL, 8, POFF(p_traceflag), LONG, "x"}, - {"ktracep", "KTRACEP", - NULL, 0, pvar, NULL, 8, POFF(p_tracep), LONG, "x"}, - {"lim", "LIM", NULL, 0, maxrss, NULL, 5}, - {"logname", "LOGNAME", NULL, LJUST, logname, NULL, MAXLOGNAME-1}, - {"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28}, - {"majflt", "MAJFLT", - NULL, USER, rvar, NULL, 4, ROFF(ru_majflt), LONG, "d"}, - {"minflt", "MINFLT", - NULL, USER, rvar, NULL, 4, ROFF(ru_minflt), LONG, "d"}, - {"msgrcv", "MSGRCV", - NULL, USER, rvar, NULL, 4, ROFF(ru_msgrcv), LONG, "d"}, - {"msgsnd", "MSGSND", - NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "d"}, - {"ni", "", "nice"}, - {"nice", "NI", NULL, 0, pvar, NULL, 2, POFF(p_nice), CHAR, "d"}, - {"nivcsw", "NIVCSW", - NULL, USER, rvar, NULL, 5, ROFF(ru_nivcsw), LONG, "d"}, - {"nsignals", "", "nsigs"}, - {"nsigs", "NSIGS", - NULL, USER, rvar, NULL, 4, ROFF(ru_nsignals), LONG, "d"}, - {"nswap", "NSWAP", - NULL, USER, rvar, NULL, 4, ROFF(ru_nswap), LONG, "d"}, - {"nvcsw", "NVCSW", - NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "d"}, - {"nwchan", "WCHAN", NULL, 0, pvar, NULL, 6, POFF(p_wchan), KPTR, "x"}, - {"oublk", "OUBLK", - NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "d"}, - {"oublock", "", "oublk"}, - {"p_ru", "P_RU", NULL, 0, pvar, NULL, 6, POFF(p_ru), KPTR, "x"}, - {"paddr", "PADDR", NULL, 0, evar, NULL, 6, EOFF(e_paddr), KPTR, "x"}, - {"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6}, - {"pcpu", "", "%cpu"}, - {"pending", "", "sig"}, - {"pgid", "PGID", - NULL, 0, evar, NULL, PIDLEN, EOFF(e_pgid), ULONG, PIDFMT}, - {"pid", "PID", NULL, 0, pvar, NULL, PIDLEN, POFF(p_pid), LONG, PIDFMT}, - {"pmem", "", "%mem"}, - {"poip", "POIP", NULL, 0, pvar, NULL, 4, POFF(p_poip), SHORT, "d"}, - {"ppid", "PPID", - NULL, 0, pvar, NULL, PIDLEN, POFF(p_ppid), LONG, PIDFMT}, - {"pri", "PRI", NULL, 0, pri, NULL, 3}, - {"re", "RE", NULL, 0, pvar, NULL, 3, POFF(p_swtime), ULONG, "d"}, - {"rgid", "RGID", - NULL, 0, pvar, NULL, UIDLEN, POFF(p_rgid), USHORT, UIDFMT}, - {"rlink", "RLINK", NULL, 0, pvar, NULL, 8, POFF(p_rlink), KPTR, "x"}, - {"rss", "RSS", NULL, 0, p_rssize, NULL, 4}, - {"rssize", "", "rsz"}, - {"rsz", "RSZ", NULL, 0, rssize, NULL, 4}, - {"ruid", "RUID", - NULL, 0, pvar, NULL, UIDLEN, POFF(p_ruid), USHORT, UIDFMT}, - {"rtprio", "RTPRIO", NULL, 0, pvar, NULL, 7, POFF(p_rtprio), LONG, "d"}, - {"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN}, - {"sess", "SESS", NULL, 0, evar, NULL, 6, EOFF(e_sess), KPTR, "x"}, - {"sig", "PENDING", NULL, 0, pvar, NULL, 8, POFF(p_sig), LONG, "x"}, - {"sigcatch", "CAUGHT", - NULL, 0, pvar, NULL, 8, POFF(p_sigcatch), LONG, "x"}, - {"sigignore", "IGNORED", - NULL, 0, pvar, NULL, 8, POFF(p_sigignore), LONG, "x"}, - {"sigmask", "BLOCKED", - NULL, 0, pvar, NULL, 8, POFF(p_sigmask), LONG, "x"}, - {"sl", "SL", NULL, 0, pvar, NULL, 3, POFF(p_slptime), ULONG, "d"}, - {"start", "STARTED", NULL, LJUST|USER, started, NULL, 7}, - {"stat", "", "state"}, - {"state", "STAT", NULL, 0, state, NULL, 4}, - {"svgid", "SVGID", - NULL, 0, pvar, NULL, UIDLEN, POFF(p_svgid), USHORT, UIDFMT}, - {"svuid", "SVUID", - NULL, 0, pvar, NULL, UIDLEN, POFF(p_svuid), USHORT, 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), ULONG, PIDFMT}, - {"trs", "TRS", NULL, 0, trss, NULL, 3}, - {"tsess", "TSESS", NULL, 0, evar, NULL, 6, EOFF(e_tsess), KPTR, "x"}, - {"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4}, - {"tt", "TT", NULL, LJUST, tname, NULL, 4}, - {"tty", "TTY", NULL, LJUST, longtname, NULL, 8}, - {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN}, - {"uid", "UID", NULL, 0, pvar, NULL, UIDLEN, POFF(p_uid),USHORT, UIDFMT}, - {"upr", "UPR", NULL, 0, pvar, NULL, 3, POFF(p_usrpri), CHAR, "d"}, - {"uprocp", "UPROCP", - NULL, USER, uvar, NULL, 6, UOFF(u_procp), KPTR, "x"}, - {"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"}, -#endif {""}, }; @@ -366,8 +249,6 @@ findvar(p) char *hp; int vcmp(); - key.name = p; - hp = strchr(p, '='); if (hp) *hp++ = '\0';