ps - Adjust ps to account for kernel changes

* ccpu no longer exists.

* pctcpu is now accurate regardless of the lwp's state.

diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 72bce80..b3190b3 100644 (file)
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -40,7 +40,6 @@ struct nlist;
 struct var;
 struct varent;
 
-extern fixpt_t ccpu;
 extern int eval, fscale, mempages, nlistread, rawcpu, cflag;
 extern int sumrusage, termwidth, totwidth;
 extern int numcpus;

diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index 11e013e..f3c94f9 100644 (file)
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -44,7 +44,6 @@
 
 #include "ps.h"
 
-fixpt_t        ccpu;                           /* kernel _ccpu variable */
 int    nlistread;                      /* if nlist already read. */
 int    mempages;                       /* number of pages of phys. memory */
 int    fscale;                         /* kernel _fscale variable */
@@ -54,9 +53,6 @@ donlist(void)
 {
        size_t oldlen;
 
-       oldlen = sizeof(ccpu);
-       if (sysctlbyname("kern.ccpu", &ccpu, &oldlen, NULL, 0) < 0)
-               return (1);
        oldlen = sizeof(fscale);
        if (sysctlbyname("kern.fscale", &fscale, &oldlen, NULL, 0) < 0)
                return (1);

diff --git a/bin/ps/print.c b/bin/ps/print.c
index 93e836d..00d8455 100644 (file)
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -516,10 +516,7 @@ getpcpu(const KINFO *k)
        /* XXX - I don't like this */
        if (KI_PROC(k, swtime) == 0 || (KI_PROC(k, flags) & P_SWAPPEDOUT))
                return (0.0);
-       if (rawcpu)
-               return (100.0 * fxtofl(KI_LWP(k, pctcpu)));
-       return (100.0 * fxtofl(KI_LWP(k, pctcpu)) /
-               (1.0 - exp(KI_PROC(k, swtime) * log(fxtofl(ccpu)))));
+       return (100.0 * fxtofl(KI_LWP(k, pctcpu)));
 }
 
 void