new vm

SCCS-vsn: bin/ps/ps.c 5.37
SCCS-vsn: bin/ps/print.c 5.4
SCCS-vsn: bin/ps/keyword.c 5.3

diff --git a/usr/src/bin/ps/keyword.c b/usr/src/bin/ps/keyword.c
index 3294143..1d8d052 100644 (file)
--- a/usr/src/bin/ps/keyword.c
+++ b/usr/src/bin/ps/keyword.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)keyword.c  5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)keyword.c  5.3 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -19,10 +19,22 @@ static char sccsid[] = "@(#)keyword.c       5.2 (Berkeley) %G%";
 #include <string.h>
 #include "ps.h"
 
 #include <string.h>
 #include "ps.h"
 

+#ifdef SPPWAIT
+#define NEWVM
+#endif
+
+#ifdef NEWVM
+#include <sys/ucred.h>
+#include <sys/kinfo_proc.h>
+#endif
+

 int    command(), cputime(), evar(), logname(), longtname(), lstarted(),
        maxrss(), p_rssize(), pagein(), pcpu(), pmem(), pri(), pvar(),
        rssize(), runame(), rvar(), started(), state(), tdev(), tname(),
 int    command(), cputime(), evar(), logname(), longtname(), lstarted(),
        maxrss(), p_rssize(), pagein(), pcpu(), pmem(), pri(), pvar(),
        rssize(), runame(), rvar(), started(), state(), tdev(), tname(),

-       trss(), tsize(), ucomm(), uname(), uvar(), vsize(), wchan();
+       tsize(), ucomm(), uname(), uvar(), vsize(), wchan();
+#ifndef NEWVM
+int    trss();
+#endif

 
 #ifdef NOTINUSE
 int    utime(), stime(), ixrss(), idrss(), isrss();
 
 #ifdef NOTINUSE
 int    utime(), stime(), ixrss(), idrss(), isrss();


@@ -46,6 +58,94 @@ int  utime(), stime(), ixrss(), idrss(), isrss();
 #define        USERLEN 8
 
 VAR var[] = {
 #define        USERLEN 8
 
 VAR var[] = {

+#ifdef NEWVM
+       {"%cpu", "%CPU", NULL, 0, pcpu, 4},
+       {"%mem", "%MEM", NULL, 0, pmem, 4},
+       {"acflag", "ACFLG", NULL, 0, pvar, 3, POFF(p_acflag), SHORT, "x"},
+       {"acflg", "", "acflag"},
+       {"blocked", "", "sigmask"},
+       {"caught", "", "sigcatch"},
+       {"command", "COMMAND", NULL, COMM|LJUST, command, 16},
+       {"cpu", "CPU", NULL, 0, pvar, 3, POFF(p_cpu), UCHAR, "d"},
+       {"cputime", "", "time"},
+       {"f", "F", NULL, 0, pvar, 7, POFF(p_flag), LONG, "x"},
+       {"flags", "", "f"},
+       {"ignored", "", "sigignore"},
+       {"inblk", "INBLK", NULL, USER, rvar, 4, ROFF(ru_inblock), LONG, "d"},
+       {"inblock", "", "inblk"},
+       {"jobc", "JOBC", NULL, 0, evar, 4, EOFF(e_jobc), SHORT, "d"},
+       {"ktrace", "KTRACE", NULL, 0, pvar, 8, POFF(p_traceflag), LONG, "x"},
+       {"ktracep", "KTRACEP", NULL, 0, pvar, 8, POFF(p_tracep), LONG, "x"},
+       {"lim", "LIM", NULL, 0, maxrss, 5},
+       {"login", "LOGIN", NULL, LJUST, logname, MAXLOGNAME},
+       {"logname", "", "login"},
+       {"lstart", "STARTED", NULL, LJUST|USER, lstarted, 28},
+       {"majflt", "MAJFLT", NULL, USER, rvar, 4, ROFF(ru_majflt), LONG, "d"},
+       {"minflt", "MINFLT", NULL, USER, rvar, 4, ROFF(ru_minflt), LONG, "d"},
+       {"msgrcv", "MSGRCV", NULL, USER, rvar, 4, ROFF(ru_msgrcv), LONG, "d"},
+       {"msgsnd", "MSGSND", NULL, USER, rvar, 4, ROFF(ru_msgsnd), LONG, "d"},
+       {"ni", "", "nice"},
+       {"nice", "NI", NULL, 0, pvar, 2, POFF(p_nice), CHAR, "d"},
+       {"nivcsw", "NIVCSW", NULL, USER, rvar, 5, ROFF(ru_nivcsw), LONG, "d"},
+       {"nsignals", "", "nsigs"},
+       {"nsigs", "NSIGS", NULL, USER, rvar, 4, ROFF(ru_nsignals), LONG, "d"},
+       {"nswap", "NSWAP", NULL, USER, rvar, 4, ROFF(ru_nswap), LONG, "d"},
+       {"nvcsw", "NVCSW", NULL, USER, rvar, 5, ROFF(ru_nvcsw), LONG, "d"},
+       {"nwchan", "WCHAN", NULL, 0, pvar, 6, POFF(p_wchan), KPTR, "x"},
+       {"oublk", "OUBLK", NULL, USER, rvar, 4, ROFF(ru_oublock), LONG, "d"},
+       {"oublock", "", "oublk"},
+       {"p_ru", "P_RU", NULL, 0, pvar, 6, POFF(p_ru), KPTR, "x"},
+       {"paddr", "PADDR", NULL, 0, evar, 6, EOFF(e_paddr), KPTR, "x"},
+       {"pagein", "PAGEIN", NULL, USER, pagein, 6},
+       {"pcpu", "", "%cpu"},
+       {"pending", "", "sig"},
+       {"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), USHORT, PIDFMT},
+       {"pid", "PID", NULL, 0, pvar, PIDLEN, POFF(p_pid),SHORT, PIDFMT},
+       {"pmem", "", "%mem"},
+       {"ppid", "PPID", NULL, 0, pvar, PIDLEN, POFF(p_ppid), SHORT, PIDFMT},
+       {"pri", "PRI", NULL, 0, pri, 3},
+       {"re", "RE", NULL, 0, pvar, 3, POFF(p_time), CHAR, "d"},
+       {"rgid", "RGID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_rgid),
+               USHORT, UIDFMT},
+       {"rlink", "RLINK", NULL, 0, pvar, 8, POFF(p_rlink), KPTR, "x"},
+       {"rss", "RSS", NULL, 0, p_rssize, 4},
+       {"rssize", "", "rsz"},
+       {"rsz", "RSZ", NULL, 0, rssize, 4},
+       {"ruid", "RUID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_ruid),
+               USHORT, UIDFMT},
+       {"ruser", "RUSER", NULL, LJUST, runame, USERLEN},
+       {"sess", "SESS", NULL, 0, evar, 6, EOFF(e_sess), KPTR, "x"},
+       {"sig", "PENDING", NULL, 0, pvar, 8, POFF(p_sig), LONG, "x"},
+       {"sigcatch", "CAUGHT", NULL, 0, pvar, 8, POFF(p_sigcatch), LONG, "x"},
+       {"sigignore", "IGNORED",
+               NULL, 0, pvar, 8, POFF(p_sigignore), LONG, "x"},
+       {"sigmask", "BLOCKED", NULL, 0, pvar, 8, POFF(p_sigmask), LONG, "x"},
+       {"sl", "SL", NULL, 0, pvar, 3, POFF(p_slptime), CHAR, "d"},
+       {"start", "STARTED", NULL, LJUST|USER, started, 8},
+       {"stat", "", "state"},
+       {"state", "STAT", NULL, 0, state, 4},
+       {"svgid", "SVGID",
+               NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svgid), USHORT, UIDFMT},
+       {"svuid", "SVUID",
+               NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svuid), USHORT, UIDFMT},
+       {"tdev", "TDEV", NULL, 0, tdev, 4},
+       {"time", "TIME", NULL, USER, cputime, 9},
+       {"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), USHORT, PIDFMT},
+       {"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
+       {"tsiz", "TSIZ", NULL, 0, tsize, 4},
+       {"tt", "TT", NULL, LJUST, tname, 3},
+       {"tty", "TTY", NULL, LJUST, longtname, 8},
+       {"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN},
+       {"uid", "UID", NULL, 0, evar, UIDLEN, EOFF(e_ucred.cr_uid),
+               USHORT, UIDFMT},
+       {"upr", "UPR", NULL, 0, pvar, 3, POFF(p_usrpri), CHAR, "d"},
+       {"user", "USER", NULL, LJUST, uname, USERLEN},
+       {"usrpri", "", "upr"},
+       {"vsize", "", "vsz"},
+       {"vsz", "VSZ", NULL, 0, vsize, 5},
+       {"wchan", "WCHAN", NULL, LJUST, wchan, 6},
+       {"xstat", "XSTAT", NULL, 0, pvar, 4, POFF(p_xstat), USHORT, "x"},
+#else

        {"%cpu", "%CPU", NULL, 0, pcpu, 4},
        {"%mem", "%MEM", NULL, 0, pmem, 4},
        {"acflag", "ACFLG", NULL, USER, uvar, 3, UOFF(u_acflag), SHORT, "x"},
        {"%cpu", "%CPU", NULL, 0, pcpu, 4},
        {"%mem", "%MEM", NULL, 0, pmem, 4},
        {"acflag", "ACFLG", NULL, USER, uvar, 3, UOFF(u_acflag), SHORT, "x"},


@@ -131,6 +231,7 @@ VAR var[] = {
        {"vsz", "VSZ", NULL, 0, vsize, 5},
        {"wchan", "WCHAN", NULL, LJUST, wchan, 6},
        {"xstat", "XSTAT", NULL, 0, pvar, 4, POFF(p_xstat), USHORT, "x"},
        {"vsz", "VSZ", NULL, 0, vsize, 5},
        {"wchan", "WCHAN", NULL, LJUST, wchan, 6},
        {"xstat", "XSTAT", NULL, 0, pvar, 4, POFF(p_xstat), USHORT, "x"},

+#endif

        {""},
 };
 
        {""},
 };
 

diff --git a/usr/src/bin/ps/print.c b/usr/src/bin/ps/print.c
index 99e95f4..b3fdd8f 100644 (file)
--- a/usr/src/bin/ps/print.c
+++ b/usr/src/bin/ps/print.c
@@ -6,24 +6,34 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)print.c    5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)print.c    5.4 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include <machine/pte.h>
-

 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
 #include <sys/stat.h>

-#include <sys/vmparam.h>
-#include <sys/vm.h>

 #include <math.h>
 #include <tzfile.h>
 #include <stddef.h>
 #include <string.h>
 #include "ps.h"
 
 #include <math.h>
 #include <tzfile.h>
 #include <stddef.h>
 #include <string.h>
 #include "ps.h"
 

+#ifdef SPPWAIT
+#define NEWVM
+#endif
+
+#ifdef NEWVM
+#include <vm/vm.h>
+#include <sys/ucred.h>
+#include <sys/kinfo_proc.h>
+#else
+#include <machine/pte.h>
+#include <sys/vmparam.h>
+#include <sys/vm.h>
+#endif
+

 printheader()
 {
        register VAR *v;
 printheader()
 {
        register VAR *v;


@@ -77,7 +87,11 @@ logname(k, v)
        KINFO *k;
        VAR *v;
 {
        KINFO *k;
        VAR *v;
 {

+#ifndef NEWVM

        (void) printf("%-*s", v->width, k->ki_p->p_logname);
        (void) printf("%-*s", v->width, k->ki_p->p_logname);

+#else /* NEWVM */
+       (void) printf("%-*s", v->width, k->ki_e->e_login);
+#endif /* NEWVM */

 }
 
 state(k, v)
 }
 
 state(k, v)


@@ -116,8 +130,10 @@ state(k, v)
        }
        cp++;
        if (flag & SLOAD) {
        }
        cp++;
        if (flag & SLOAD) {

+#ifndef NEWVM

                if (p->p_rssize > p->p_maxrss)
                        *cp++ = '>';
                if (p->p_rssize > p->p_maxrss)
                        *cp++ = '>';

+#endif

        } else
                *cp++ = 'W';
        if (p->p_nice < NZERO)
        } else
                *cp++ = 'W';
        if (p->p_nice < NZERO)


@@ -130,9 +146,13 @@ state(k, v)
                *cp++ = 'S';
        if (flag & STRC)
                *cp++ = 'X';
                *cp++ = 'S';
        if (flag & STRC)
                *cp++ = 'X';

-       if (flag & SWEXIT)
+       if (flag & SWEXIT && p->p_stat != SZOMB)

                *cp++ = 'E';
                *cp++ = 'E';

+#ifdef NEWVM
+       if (flag & SPPWAIT)
+#else

        if (flag & SVFORK)
        if (flag & SVFORK)

+#endif

                *cp++ = 'V';
        if (flag & (SSYS|SLOCK|SULOCK|SKEEP|SPHYSIO))
                *cp++ = 'L';
                *cp++ = 'V';
        if (flag & (SSYS|SLOCK|SULOCK|SKEEP|SPHYSIO))
                *cp++ = 'L';


@@ -155,14 +175,24 @@ uname(k, v)
        KINFO *k;
        VAR *v;
 {
        KINFO *k;
        VAR *v;
 {

+#ifndef NEWVM

        (void) printf("%-*s", v->width, user_from_uid(k->ki_p->p_uid, 0));
        (void) printf("%-*s", v->width, user_from_uid(k->ki_p->p_uid, 0));

+#else /* NEWVM */
+       (void) printf("%-*s", v->width,
+               user_from_uid(k->ki_e->e_ucred.cr_uid, 0));
+#endif /* NEWVM */

 }
 
 runame(k, v)
        KINFO *k;
        VAR *v;
 {
 }
 
 runame(k, v)
        KINFO *k;
        VAR *v;
 {

+#ifndef NEWVM

        (void) printf("%-*s", v->width, user_from_uid(k->ki_p->p_ruid, 0));
        (void) printf("%-*s", v->width, user_from_uid(k->ki_p->p_ruid, 0));

+#else /* NEWVM */
+       (void) printf("%-*s", v->width,
+               user_from_uid(k->ki_e->e_pcred.p_ruid, 0));
+#endif /* NEWVM */

 }
 
 tdev(k, v)
 }
 
 tdev(k, v)


@@ -262,7 +292,7 @@ wchan(k, v)
        VAR *v;
 {
        if (k->ki_p->p_wchan) {
        VAR *v;
 {
        if (k->ki_p->p_wchan) {

-               if (k->ki_p->p_pri > PZERO)
+               if (k->ki_p->p_wmesg)

                        (void) printf("%-*.*s", v->width, v->width, k->ki_e->e_wmesg);
                else
                        (void) printf("%*x", v->width,
                        (void) printf("%-*.*s", v->width, v->width, k->ki_e->e_wmesg);
                else
                        (void) printf("%*x", v->width,


@@ -278,23 +308,37 @@ vsize(k, v)
        VAR *v;
 {
        (void) printf("%*d", v->width,
        VAR *v;
 {
        (void) printf("%*d", v->width,

+#ifndef NEWVM

            pgtok(k->ki_p->p_dsize + k->ki_p->p_ssize + k->ki_e->e_xsize));
            pgtok(k->ki_p->p_dsize + k->ki_p->p_ssize + k->ki_e->e_xsize));

+#else /* NEWVM */
+           pgtok(k->ki_e->e_vm.vm_dsize + k->ki_e->e_vm.vm_ssize +
+               k->ki_e->e_vm.vm_tsize));
+#endif /* NEWVM */

 }
 
 rssize(k, v)
        KINFO *k;
        VAR *v;
 {
 }
 
 rssize(k, v)
        KINFO *k;
        VAR *v;
 {

+#ifndef NEWVM

        (void) printf("%*d", v->width,
            pgtok(k->ki_p->p_rssize + (k->ki_e->e_xccount ?
            (k->ki_e->e_xrssize / k->ki_e->e_xccount) : 0)));
        (void) printf("%*d", v->width,
            pgtok(k->ki_p->p_rssize + (k->ki_e->e_xccount ?
            (k->ki_e->e_xrssize / k->ki_e->e_xccount) : 0)));

+#else /* NEWVM */
+       /* XXX don't have info about shared */
+       (void) printf("%*d", v->width, pgtok(k->ki_e->e_vm.vm_rssize));
+#endif /* NEWVM */

 }
 
 p_rssize(k, v)         /* doesn't account for text */
        KINFO *k;
        VAR *v;
 {
 }
 
 p_rssize(k, v)         /* doesn't account for text */
        KINFO *k;
        VAR *v;
 {

+#ifndef NEWVM

        (void) printf("%*d", v->width, pgtok(k->ki_p->p_rssize));
        (void) printf("%*d", v->width, pgtok(k->ki_p->p_rssize));

+#else /* NEWVM */
+       (void) printf("%*d", v->width, pgtok(k->ki_e->e_vm.vm_rssize));
+#endif /* NEWVM */

 }
 
 cputime(k, v)
 }
 
 cputime(k, v)


@@ -384,10 +428,17 @@ getpmem(k)
        e = k->ki_e;
        if ((p->p_flag & SLOAD) == 0)
                return (0.0);
        e = k->ki_e;
        if ((p->p_flag & SLOAD) == 0)
                return (0.0);

+#ifndef NEWVM

        szptudot = UPAGES + clrnd(ctopt(p->p_dsize + p->p_ssize + e->e_xsize));
        fracmem = ((float)p->p_rssize + szptudot)/CLSIZE/ecmx;
        if (p->p_textp && e->e_xccount)
                fracmem += ((float)e->e_xrssize)/CLSIZE/e->e_xccount/ecmx;
        szptudot = UPAGES + clrnd(ctopt(p->p_dsize + p->p_ssize + e->e_xsize));
        fracmem = ((float)p->p_rssize + szptudot)/CLSIZE/ecmx;
        if (p->p_textp && e->e_xccount)
                fracmem += ((float)e->e_xrssize)/CLSIZE/e->e_xccount/ecmx;

+#else /* NEWVM */
+       /* XXX want pmap ptpages, segtab, etc. (per architecture) */
+       szptudot = UPAGES;
+       /* XXX don't have info about shared */
+       fracmem = ((float)e->e_vm.vm_rssize + szptudot)/CLSIZE/ecmx;
+#endif /* NEWVM */

        return (100.0 * fracmem);
 }
 
        return (100.0 * fracmem);
 }
 


@@ -409,9 +460,11 @@ maxrss(k, v)
        KINFO *k;
        VAR *v;
 {
        KINFO *k;
        VAR *v;
 {

+#ifndef NEWVM  /* not yet */

        if (k->ki_p->p_maxrss != (RLIM_INFINITY/NBPG))
                (void) printf("%*d", v->width, pgtok(k->ki_p->p_maxrss));
        else
        if (k->ki_p->p_maxrss != (RLIM_INFINITY/NBPG))
                (void) printf("%*d", v->width, pgtok(k->ki_p->p_maxrss));
        else

+#endif /* NEWVM */

                (void) printf("%*s", v->width, "-");
 }
 
                (void) printf("%*s", v->width, "-");
 }
 


@@ -419,15 +472,21 @@ tsize(k, v)
        KINFO *k;
        VAR *v;
 {
        KINFO *k;
        VAR *v;
 {

+#ifndef NEWVM

        (void) printf("%*d", v->width, pgtok(k->ki_e->e_xsize));
        (void) printf("%*d", v->width, pgtok(k->ki_e->e_xsize));

+#else /* NEWVM */
+       (void) printf("%*d", v->width, pgtok(k->ki_e->e_vm.vm_tsize));
+#endif /* NEWVM */

 }
 
 }
 

+#ifndef NEWVM

 trss(k, v)
        KINFO *k;
        VAR *v;
 {
        (void) printf("%*d", v->width, pgtok(k->ki_e->e_xrssize));
 }
 trss(k, v)
        KINFO *k;
        VAR *v;
 {
        (void) printf("%*d", v->width, pgtok(k->ki_e->e_xrssize));
 }

+#endif /* NEWVM */

 
 /*
  * Generic output routines.  Print fields from various prototype
 
 /*
  * Generic output routines.  Print fields from various prototype

diff --git a/usr/src/bin/ps/ps.c b/usr/src/bin/ps/ps.c
index 90a3a91..5d1c527 100644 (file)
--- a/usr/src/bin/ps/ps.c
+++ b/usr/src/bin/ps/ps.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)ps.c       5.36 (Berkeley) %G%";
+static char sccsid[] = "@(#)ps.c       5.37 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -33,6 +33,10 @@ static char sccsid[] = "@(#)ps.c     5.36 (Berkeley) %G%";
 #include <paths.h>
 #include "ps.h"
 
 #include <paths.h>
 #include "ps.h"
 

+#ifdef SPPWAIT
+#define NEWVM
+#endif
+

 KINFO *kinfo;
 VAR *vhead, *vtail;
 
 KINFO *kinfo;
 VAR *vhead, *vtail;
 


@@ -314,11 +318,17 @@ saveuser(ki)
                /*
                 * save important fields
                 */
                /*
                 * save important fields
                 */

+#ifdef NEWVM
+               usp->u_start = up->u_stats.p_start;
+               usp->u_ru = up->u_stats.p_ru;
+               usp->u_cru = up->u_stats.p_cru;
+#else

                usp->u_procp = up->u_procp;
                usp->u_start = up->u_start;
                usp->u_ru = up->u_ru;
                usp->u_cru = up->u_cru;
                usp->u_acflag = up->u_acflag;
                usp->u_procp = up->u_procp;
                usp->u_start = up->u_start;
                usp->u_ru = up->u_ru;
                usp->u_cru = up->u_cru;
                usp->u_acflag = up->u_acflag;

+#endif

        }
 }
 
        }
 }
 


@@ -326,7 +336,12 @@ pscomp(k1, k2)
        KINFO *k1, *k2;
 {
        int i;
        KINFO *k1, *k2;
 {
        int i;

+#ifdef NEWVM
+#define VSIZE(k) ((k)->ki_e->e_vm.vm_dsize + (k)->ki_e->e_vm.vm_ssize + \
+                 (k)->ki_e->e_vm.vm_tsize)
+#else

 #define VSIZE(k) ((k)->ki_p->p_dsize + (k)->ki_p->p_ssize + (k)->ki_e->e_xsize)
 #define VSIZE(k) ((k)->ki_p->p_dsize + (k)->ki_p->p_ssize + (k)->ki_e->e_xsize)

+#endif

 
        if (sortby == SORTCPU)
                return (getpcpu(k2) - getpcpu(k1));
 
        if (sortby == SORTCPU)
                return (getpcpu(k2) - getpcpu(k1));