break out special local mail processing (e.g., mapping to the

[unix-history] / usr / src / bin / ps / nlist.c

diff --git a/usr/src/bin/ps/nlist.c b/usr/src/bin/ps/nlist.c
index ca23965..9e98615 100644 (file)
--- a/usr/src/bin/ps/nlist.c
+++ b/usr/src/bin/ps/nlist.c
@@ -1,61 +1,110 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint
  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)nlist.c    5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)nlist.c    8.4 (Berkeley) %G%";

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

-#include <sys/types.h>
-#include <nlist.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/proc.h>
+#include <sys/resource.h>
+
+#include <err.h>

 #include <errno.h>
 #include <errno.h>

+#include <kvm.h>
+#include <nlist.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <string.h>
+
+#include "ps.h"
+
+#ifdef P_PPWAIT
+#define NEWVM
+#endif

 
 struct nlist psnl[] = {
 
 struct nlist psnl[] = {

-       {"_ecmx"},
-#define        X_ECMX          0

        {"_fscale"},
        {"_fscale"},

-#define        X_FSCALE        1
+#define        X_FSCALE        0

        {"_ccpu"},
        {"_ccpu"},

-#define        X_CCPU          2
+#define        X_CCPU          1
+#ifdef NEWVM
+       {"_avail_start"},
+#define        X_AVAILSTART    2
+       {"_avail_end"},
+#define        X_AVAILEND      3
+#else
+       {"_ecmx"},
+#define        X_ECMX          2
+#endif

        {NULL}
 };
 
 fixpt_t        ccpu;                           /* kernel _ccpu variable */
 int    nlistread;                      /* if nlist already read. */
        {NULL}
 };
 
 fixpt_t        ccpu;                           /* kernel _ccpu variable */
 int    nlistread;                      /* if nlist already read. */

-int    ecmx;                           /* kernel _ecmx variable */
+int    mempages;                       /* number of pages of phys. memory */

 int    fscale;                         /* kernel _fscale variable */
 
 int    fscale;                         /* kernel _fscale variable */
 

+extern kvm_t *kd;
+

 #define kread(x, v) \
 #define kread(x, v) \

-       kvm_read(psnl[x].n_value, (char *)&v, sizeof v) != sizeof(v)
+       kvm_read(kd, psnl[x].n_value, (char *)&v, sizeof v) != sizeof(v)

 
 

+int

 donlist()
 {
 donlist()
 {

-       extern int eval;

        int rval;
        int rval;

+#ifdef NEWVM
+       int tmp;
+#endif

 
        rval = 0;
        nlistread = 1;
 
        rval = 0;
        nlistread = 1;

-       if (kvm_nlist(psnl)) {
-               (void)fprintf(stderr, "ps: kvm_nlist: %s\n", strerror(errno));
+       if (kvm_nlist(kd, psnl)) {
+               nlisterr(psnl);

                eval = 1;
                eval = 1;

-               return(1);
+               return (1);

        }
        if (kread(X_FSCALE, fscale)) {
        }
        if (kread(X_FSCALE, fscale)) {

-               (void)fprintf(stderr, "ps: fscale: %s\n", kvm_geterr());
+               warnx("fscale: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
                eval = rval = 1;
        }

-       if (kread(X_ECMX, ecmx)) {
-               (void)fprintf(stderr, "ps: ecmx: %s\n", kvm_geterr());
+#ifdef NEWVM
+       if (kread(X_AVAILEND, mempages)) {
+               warnx("avail_start: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
                eval = rval = 1;
        }

+       if (kread(X_AVAILSTART, tmp)) {
+               warnx("avail_end: %s", kvm_geterr(kd));
+               eval = rval = 1;
+       }
+       mempages -= tmp;
+#else
+       if (kread(X_ECMX, mempages)) {
+               warnx("ecmx: %s", kvm_geterr(kd));
+               eval = rval = 1;
+       }
+#endif

        if (kread(X_CCPU, ccpu)) {
        if (kread(X_CCPU, ccpu)) {

-               (void)fprintf(stderr, "ps: ccpu: %s\n", kvm_geterr());
+               warnx("ccpu: %s", kvm_geterr(kd));

                eval = rval = 1;
        }
                eval = rval = 1;
        }

-       return(rval);
+       return (rval);

 }
 
 }
 

+void
+nlisterr(nl)
+       struct nlist nl[];
+{
+       int i;
+
+       (void)fprintf(stderr, "ps: nlist: can't find following symbols:");
+       for (i = 0; nl[i].n_name != NULL; i++)
+               if (nl[i].n_value == 0)
+                       (void)fprintf(stderr, " %s", nl[i].n_name);
+       (void)fprintf(stderr, "\n");
+}