Fwd: DragonFly patch for top-3.8b1

Dear all,

below is a patch that should add native DF support to the latest =20
version of top (3.8beta1).

You will also need to update config.guess and config.sub as supplied =20
by top with the latest version. The can be fetched from here:

http://git.savannah.gnu.org/gitweb/?p=3Dconfig.git;a=3Dblob_plain;f=3Dconfig=
..guess;hb=3DHEAD
http://git.savannah.gnu.org/gitweb/?p=3Dconfig.git;a=3Dblob_plain;f=3Dconfig=
..sub;hb=3DHEAD

Please test and comment. If ok I will send the patch to unixtop.org =20
and ask for incorporation into offical branch.

Cheers

Jan



----- Weitergeleitete Nachricht von [e-mail] -----
      Datum: Wed, 18 Nov 2009 16:42:16 +0100 (CET)
        Von: [e-mail]
Antwort an: [e-mail]
    Betreff: DragonFly patch for top-3.8b1
         An: [e-mail]

diff -x 'config.guess*' -x 'config.sub*' -rNu top-3.8beta1/configure =20
top-3.8beta1df/configure
--- top-3.8beta1/configure=092008-05-07 05:41:39 +0200
+++ top-3.8beta1df/configure=092009-11-18 16:02:10 +0100
@@ -6116,6 +6116,7 @@
  =09osf1*)=09=09MODULE=3Ddecosf1;;
  =09osf4*)=09=09MODULE=3Ddecosf1;;
  =09osf5*)=09=09MODULE=3Ddecosf1;;
+=09dragonfly*)     MODULE=3Ddragonfly; LIBS=3D"$LIBS -lkinfo";;
          freebsd*)=09MODULE=3Dfreebsd; USE_KMEM=3D1; USE_FPH=3D1;;
  =09hpux7*)=09=09MODULE=3Dhpux7;;
  =09hpux8*)=09=09MODULE=3Dhpux8;;
diff -x 'config.guess*' -x 'config.sub*' -rNu =20
top-3.8beta1/machine/m_dragonfly.c top-3.8beta1df/machine/m_dragonfly.c
--- top-3.8beta1/machine/m_dragonfly.c=091970-01-01 01:00:00 +0100
+++ top-3.8beta1df/machine/m_dragonfly.c=092009-11-18 16:32:37 +0100
@@ -0,0 +1,961 @@
+/*
+ * top - a top users display for Unix
+ *
+ * SYNOPSIS:  For FreeBSD-2.x and later
+ *
+ * DESCRIPTION:
+ * Originally written for BSD4.4 system by Christos Zoulas.
+ * Ported to FreeBSD 2.x by Steven Wallace && Wolfram Schneider
+ * Order support hacked in from top-3.5beta6/machine/m_aix41.c
+ *   by Monte Mitzelfelt (for latest top see =20
http://www.groupsys.com/topinfo/)
+ *
+ * This is the machine-dependent module for FreeBSD 2.2
+ * Works for:
+ *=09FreeBSD 2.2.x, 3.x, 4.x, and probably FreeBSD 2.1.x
+ *
+ * LIBS: -lkvm
+ *
+ * AUTHOR:  Christos Zoulas <[e-mail]>
+ *          Steven Wallace  <[e-mail]>
+ *          Wolfram Schneider <[e-mail]>
+ *          Hiten Pandya <[e-mail]>
+ *
+ * $FreeBSD: src/usr.bin/top/machine.c,v 1.29.2.2 2001/07/31 20:27:05 =20
tmm Exp $
+ * $DragonFly: src/usr.bin/top/machine.c,v 1.26 2008/10/16 01:52:33 =20
swildner Exp $
+ */
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/signal.h>
+#include <sys/param.h>
+
+#include "os.h"
+#include <err.h>
+#include <kvm.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <math.h>
+#include <pwd.h>
+#include <sys/errno.h>
+#include <sys/sysctl.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#include <sys/user.h>
+#include <sys/vmmeter.h>
+#include <sys/resource.h>
+#include <sys/rtprio.h>
+
+/* Swap */
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/conf.h>
+
+#include <osreldate.h> /* for changes in kernel structures */
+
+#include <sys/kinfo.h>
+#include <kinfo.h>
+#include "top.h"
+#include "display.h"
+#include "machine.h"
+#include "screen.h"
+#include "utils.h"
+
+#if 0
+static int check_nlist(struct nlist *);
+static int getkval(unsigned long, int *, int, char *);
+#endif
+int swapmode(int *retavail, int *retfree);
+static int smpmode;
+static int namelength;
+static int cmdlength;
+
+int n_cpus =3D 0;
+
+/*
+ * needs to be a global symbol, so wrapper can be
+ * modified accordingly.
+ */
+static int show_threads =3D 0;
+
+/* get_process_info passes back a handle.  This is what it looks like: */
+
+struct handle
+{
+    struct kinfo_proc **next_proc;=09/* points to next valid proc pointer *=
/
+    int remaining;=09=09/* number of pointers remaining */
+};
+
+/* declarations for load_avg */
+#include "loadavg.h"
+
+#define PP(pp, field) ((pp)->kp_ ## field)
+#define LP(pp, field) ((pp)->kp_lwp.kl_ ## field)
+#define VP(pp, field) ((pp)->kp_vm_ ## field)
+
+/* define what weighted cpu is.  */
+#define weighted_cpu(pct, pp) (PP((pp), swtime) =3D=3D 0 ? 0.0 : \
+=09=09=09 ((pct) / (1.0 - exp(PP((pp), swtime) * logcpu))))
+
+/* what we consider to be process size: */
+#define PROCSIZE(pp) (VP((pp), map_size) / 1024)
+
+/*
+ *  These definitions control the format of the per-process area
+ */
+
+static char smp_header[] =3D
+  "  PID %-*.*s PRI NICE  SIZE    RES STATE  C   TIME   WCPU    CPU COMMAND=
";
+
+#define smp_Proc_format \
+=09"%5d %-*.*s %3d %3d%7s %6s %-6.6s %1x%7s %5.2f%% %5.2f%% %.*s"
+
+static char up_header[] =3D
+  "  PID %-*.*s PRI NICE  SIZE    RES STATE    TIME   WCPU    CPU COMMAND";
+
+#define up_Proc_format \
+=09"%5d %-*.*s %3d %3d%7s %6s %-6.6s%.0d%7s %5.2f%% %5.2f%% %.*s"
+
+
+
+/* process state names for the "STATE" column of the display */
+/* the extra nulls in the string "run" are for adding a slash and
+   the processor number when needed */
+
+const char *state_abbrev[] =3D
+{
+    "", "RUN\0\0\0", "STOP", "SLEEP",
+};
+
+
+static kvm_t *kd;
+
+/* values that we stash away in _init and use in later routines */
+
+static double logcpu;
+
+static long lastpid;
+static int ccpu;
+
+/* these are for calculating cpu state percentages */
+
+static struct kinfo_cputime *cp_time, *cp_old;
+
+/* these are for detailing the process states */
+
+int process_states[6];
+char *procstatenames[] =3D {
+    "", " starting, ", " running, ", " sleeping, ", " stopped, ",
+    " zombie, ",
+    NULL
+};
+
+/* these are for detailing the cpu states */
+#define CPU_STATES 5
+int *cpu_states;
+char *cpustatenames[CPU_STATES + 1] =3D {
+    "user", "nice", "system", "interrupt", "idle", NULL
+};
+
+/* these are for detailing the memory statistics */
+
+long memory_stats[7];
+char *memorynames[] =3D {
+    "K Active, ", "K Inact, ", "K Wired, ", "K Cache, ", "K Buf, ", "K Free=
",
+    NULL
+};
+
+long swap_stats[7];
+char *swapnames[] =3D {
+/*   0           1            2           3            4       5 */
+    "K Total, ", "K Used, ", "K Free, ", "% Inuse, ", "K In, ", "K Out",
+    NULL
+};
+
+
+/* these are for keeping track of the proc array */
+
+static int nproc;
+static int onproc =3D -1;
+static int pref_len;
+static struct kinfo_proc *pbase;
+static struct kinfo_proc **pref;
+
+/* these are for getting the memory statistics */
+
+static int pageshift;=09=09/* log base 2 of the pagesize */
+
+/* define pagetok in terms of pageshift */
+
+#define pagetok(size) ((size) << pageshift)
+
+/* sorting orders. first is default */
+char *ordernames[] =3D {
+    "cpu", "size", "res", "time", "pri", "thr", NULL
+};
+
+/* compare routines */
+int proc_compare(), compare_size(), compare_res(), compare_time(), =20
compare_prio(), compare_thr();
+
+int (*proc_compares[])() =3D {
+    proc_compare,
+    compare_size,
+    compare_res,
+    compare_time,
+    compare_prio,
+    NULL
+};
+
+static void
+cputime_percentages(int out[CPU_STATES], struct kinfo_cputime *new,
+=09=09    struct kinfo_cputime *old)
+{
+        struct kinfo_cputime diffs;
+=09uint64_t total_change, half_total;
+
+        /* initialization */
+=09total_change =3D 0;
+
+        diffs.cp_user =3D new->cp_user - old->cp_user;
+=09diffs.cp_nice =3D new->cp_nice - old->cp_nice;
+=09diffs.cp_sys =3D new->cp_sys - old->cp_sys;
+        diffs.cp_intr =3D new->cp_intr - old->cp_intr;
+        diffs.cp_idle =3D new->cp_idle - old->cp_idle;
+=09total_change =3D diffs.cp_user + diffs.cp_nice + diffs.cp_sys +
+    =09    diffs.cp_intr + diffs.cp_idle;
+        old->cp_user =3D new->cp_user;
+        old->cp_nice =3D new->cp_nice;
+        old->cp_sys =3D new->cp_sys;
+        old->cp_intr =3D new->cp_intr;
+=09old->cp_idle =3D new->cp_idle;
+
+        /* avoid divide by zero potential */
+=09if (total_change =3D=3D 0)
+=09=09total_change =3D 1;
+
+=09/* calculate percentages based on overall change, rounding up */
+        half_total =3D total_change >> 1;
+
+=09out[0] =3D ((diffs.cp_user * 1000LL + half_total) / total_change);
+        out[1] =3D ((diffs.cp_nice * 1000LL + half_total) / total_change);
+=09out[2] =3D ((diffs.cp_sys * 1000LL + half_total) / total_change);
+        out[3] =3D ((diffs.cp_intr * 1000LL + half_total) / total_change);
+=09out[4] =3D ((diffs.cp_idle * 1000LL + half_total) / total_change);
+}
+
+int
+machine_init(struct statics *statics)
+{
+    int pagesize;
+    size_t modelen;
+    struct passwd *pw;
+    struct timeval boottime;
+
+    if (n_cpus < 1) {
+=09if (kinfo_get_cpus(&n_cpus))
+=09    err(1, "kinfo_get_cpus failed");
+    }
+
+    /* get boot time */
+    modelen =3D sizeof(boottime);
+    if (sysctlbyname("kern.boottime", &boottime, &modelen, NULL, 0) =3D=3D =
-1)
+    {
+        /* we have no boottime to report */
+        boottime.tv_sec =3D -1;
+    }
+
+    modelen =3D sizeof(smpmode);
+    if ((sysctlbyname("machdep.smp_active", &smpmode, &modelen, NULL, =20
0) < 0 &&
+         sysctlbyname("smp.smp_active", &smpmode, &modelen, NULL, 0) < 0) |=
|
+=09modelen !=3D sizeof(smpmode))
+=09    smpmode =3D 0;
+
+    while ((pw =3D getpwent()) !=3D NULL) {
+=09if ((int)strlen(pw->pw_name) > namelength)
+=09    namelength =3D strlen(pw->pw_name);
+    }
+    if (namelength < 8)
+=09namelength =3D 8;
+    if (smpmode && namelength > 13)
+=09namelength =3D 13;
+    else if (namelength > 15)
+=09namelength =3D 15;
+
+    if ((kd =3D kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) =3D=3D NU=
LL)
+=09return -1;
+
+    if (kinfo_get_sched_ccpu(&ccpu)) {
+=09fprintf(stderr, "top: kinfo_get_sched_ccpu failed\n");
+=09return(-1);
+    }
+
+    /* this is used in calculating WCPU -- calculate it ahead of time */
+    logcpu =3D log(loaddouble(ccpu));
+
+    pbase =3D NULL;
+    pref =3D NULL;
+    nproc =3D 0;
+    onproc =3D -1;
+    /* get the page size with "getpagesize" and calculate pageshift =20
from it */
+    pagesize =3D getpagesize();
+    pageshift =3D 0;
+    while (pagesize > 1)
+    {
+=09pageshift++;
+=09pagesize >>=3D 1;
+    }
+
+    /* we only need the amount of log(2)1024 for our conversion */
+    pageshift -=3D LOG1024;
+
+    /* fill in the statics information */
+    statics->procstate_names =3D procstatenames;
+    statics->cpustate_names =3D cpustatenames;
+    statics->memory_names =3D memorynames;
+    statics->boottime =3D boottime.tv_sec;
+    statics->swap_names =3D swapnames;
+    statics->order_names =3D ordernames;
+
+    /* all done! */
+    return(0);
+}
+
+char *
+format_header(char *uname_field)
+{
+    static char Header[128];
+
+    snprintf(Header, sizeof(Header), smpmode ? smp_header : up_header,
+=09     namelength, namelength, uname_field);
+
+    if (screen_width <=3D 79)
+    =09cmdlength =3D 80;
+    else
+=09cmdlength =3D 89;
+
+    cmdlength =3D cmdlength - strlen(Header) + 6;
+
+    return Header;
+}
+
+static int swappgsin =3D -1;
+static int swappgsout =3D -1;
+extern struct timeval timeout;
+
+void
+get_system_info(struct system_info *si)
+{
+    size_t len;
+    int cpu;
+
+    if (cpu_states =3D=3D NULL) {
+        cpu_states =3D malloc(sizeof(*cpu_states) * CPU_STATES * n_cpus);
+        if (cpu_states =3D=3D NULL)
+            err(1, "malloc");
+        bzero(cpu_states, sizeof(*cpu_states) * CPU_STATES * n_cpus);
+    }
+    if (cp_time =3D=3D NULL) {
+        cp_time =3D malloc(2 * n_cpus * sizeof(cp_time[0]));
+        if (cp_time =3D=3D NULL)
+            err(1, "cp_time");
+        cp_old =3D cp_time + n_cpus;
+
+        len =3D n_cpus * sizeof(cp_old[0]);
+        bzero(cp_time, len);
+        if (sysctlbyname("kern.cputime", cp_old, &len, NULL, 0))
+            err(1, "kern.cputime");
+    }
+
+    len =3D n_cpus * sizeof(cp_time[0]);
+    bzero(cp_time, len);
+    if (sysctlbyname("kern.cputime", cp_time, &len, NULL, 0))
+        err(1, "kern.cputime");
+
+    getloadavg(si->load_avg, 3);
+
+    lastpid =3D 0;
+
+    /* convert cp_time counts to percentages */
+    for (cpu =3D 0; cpu < n_cpus; ++cpu) {
+        cputime_percentages(cpu_states + cpu * CPU_STATES,
+                            &cp_time[cpu], &cp_old[cpu]);
+    }
+
+    /* sum memory & swap statistics */
+    {
+        struct vmmeter vmm;
+        struct vmstats vms;
+        size_t vms_size =3D sizeof(vms);
+        size_t vmm_size =3D sizeof(vmm);
+        static unsigned int swap_delay =3D 0;
+        static int swapavail =3D 0;
+        static int swapfree =3D 0;
+        static int bufspace =3D 0;
+
+        if (sysctlbyname("vm.vmstats", &vms, &vms_size, NULL, 0))
+                err(1, "sysctlbyname: vm.vmstats");
+
+        if (sysctlbyname("vm.vmmeter", &vmm, &vmm_size, NULL, 0))
+                err(1, "sysctlbyname: vm.vmmeter");
+
+        if (kinfo_get_vfs_bufspace(&bufspace))
+                err(1, "kinfo_get_vfs_bufspace");
+
+        /* convert memory stats to Kbytes */
+        memory_stats[0] =3D pagetok(vms.v_active_count);
+        memory_stats[1] =3D pagetok(vms.v_inactive_count);
+        memory_stats[2] =3D pagetok(vms.v_wire_count);
+        memory_stats[3] =3D pagetok(vms.v_cache_count);
+        memory_stats[4] =3D bufspace / 1024;
+        memory_stats[5] =3D pagetok(vms.v_free_count);
+        memory_stats[6] =3D -1;
+
+        /* first interval */
+        if (swappgsin < 0) {
+            swap_stats[4] =3D 0;
+            swap_stats[5] =3D 0;
+        }
+
+        /* compute differences between old and new swap statistic */
+        else {
+            swap_stats[4] =3D pagetok(((vmm.v_swappgsin - swappgsin)));
+            swap_stats[5] =3D pagetok(((vmm.v_swappgsout - swappgsout)));
+        }
+
+        swappgsin =3D vmm.v_swappgsin;
+        swappgsout =3D vmm.v_swappgsout;
+
+        /* call CPU heavy swapmode() only for changes */
+        if (swap_stats[4] > 0 || swap_stats[5] > 0 || swap_delay =3D=3D 0) =
{
+            swap_stats[3] =3D swapmode(&swapavail, &swapfree);
+            swap_stats[0] =3D swapavail;
+            swap_stats[1] =3D swapavail - swapfree;
+            swap_stats[2] =3D swapfree;
+        }
+        swap_delay =3D 1;
+        swap_stats[6] =3D -1;
+    }
+
+    /* set arrays and strings */
+    si->cpustates =3D cpu_states;
+    si->memory =3D memory_stats;
+    si->swap =3D swap_stats;
+
+
+    if(lastpid > 0) {
+        si->last_pid =3D lastpid;
+    } else {
+        si->last_pid =3D -1;
+    }
+}
+
+
+static struct handle handle;
+
+caddr_t get_process_info(struct system_info *si, struct process_select *sel=
,
+                         int compare_index)
+{
+    register int i;
+    register int total_procs;
+    register int active_procs;
+    register struct kinfo_proc **prefp;
+    register struct kinfo_proc *pp;
+
+    /* these are copied out of sel for speed */
+    int show_idle;
+    int show_self;
+    int show_system;
+    int show_uid;
+
+    pbase =3D kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc);
+    if (nproc > onproc)
+        pref =3D (struct kinfo_proc **) realloc(pref, sizeof(struct =20
kinfo_proc *)
+                * (onproc =3D nproc));
+    if (pref =3D=3D NULL || pbase =3D=3D NULL) {
+        (void) fprintf(stderr, "top: Out of memory.\n");
+        quit(23);
+    }
+    /* get a pointer to the states summary array */
+    si->procstates =3D process_states;
+
+    /* set up flags which define what we are going to select */
+    show_idle =3D sel->idle;
+    show_self =3D 0;
+    show_system =3D sel->system;
+    show_uid =3D sel->uid !=3D -1;
+
+    /* count up process states and get pointers to interesting procs */
+    total_procs =3D 0;
+    active_procs =3D 0;
+    memset((char *)process_states, 0, sizeof(process_states));
+    prefp =3D pref;
+    for (pp =3D pbase, i =3D 0; i < nproc; pp++, i++)
+    {
+        /*
+         *  Place pointers to each valid proc structure in pref[].
+         *  Process slots that are actually in use have a non-zero
+         *  status field.  Processes with P_SYSTEM set are system
+         *  processes---these get ignored unless show_sysprocs is set.
+         */
+=09if (((show_threads && (LP(pp, pid) =3D=3D -1)) ||
+            ((show_self !=3D PP(pp, pid)) &&
+            (show_system || ((PP(pp, flags) & P_SYSTEM) =3D=3D 0)))))
+        {
+            total_procs++;
+            process_states[(unsigned char) PP(pp, stat)]++;
+            if ((show_threads && (LP(pp, pid) =3D=3D -1)) ||
+                (show_idle || (LP(pp, pctcpu) !=3D 0) ||
+                (((LP(pp, stat) =3D=3D LSRUN)) &&
+                (!show_uid || PP(pp, ruid) =3D=3D (uid_t)sel->uid))))
+            {
+                *prefp++ =3D pp;
+                active_procs++;
+            }
+        }
+    }
+
+    qsort((char *)pref, active_procs, sizeof(struct kinfo_proc *),
+          proc_compares[compare_index]);
+
+    /* remember active and total counts */
+    si->p_total =3D total_procs;
+    si->p_active =3D pref_len =3D active_procs;
+
+    /* pass back a handle */
+    handle.next_proc =3D pref;
+    handle.remaining =3D active_procs;
+    return((caddr_t)&handle);
+}
+
+char fmt[128];=09=09/* static area where result is built */
+
+char *
+format_next_process(caddr_t xhandle, char *(*get_userid)())
+{
+    struct kinfo_proc *pp;
+    long cputime;
+    double pct;
+    struct handle *hp;
+    char status[16];
+    char const *wrapper;
+    int state;
+    int xnice;
+
+    /* find and remember the next proc structure */
+    hp =3D (struct handle *)xhandle;
+    pp =3D *(hp->next_proc++);
+    hp->remaining--;
+
+    /* set the wrapper for the process/thread name */
+    if ((PP(pp, flags) & P_SWAPPEDOUT))
+=09 wrapper =3D "[]"; /* swapped process [pname] */
+    else if (((PP(pp, flags) & P_SYSTEM) !=3D 0) && (LP(pp, pid) > 0))
+=09 wrapper =3D "()"; /* system process (pname) */
+    else if (show_threads && (LP(pp, pid) =3D=3D -1))
+=09 wrapper =3D "<>"; /* pure kernel threads <thread> */
+    else
+=09 wrapper =3D NULL;
+
+    /* get the process's command name */
+    if (wrapper !=3D NULL) {
+=09char *comm =3D PP(pp, comm);
+#define COMSIZ sizeof(PP(pp, comm))
+=09char buf[COMSIZ];
+=09(void) strncpy(buf, comm, COMSIZ);
+=09comm[0] =3D wrapper[0];
+=09(void) strncpy(&comm[1], buf, COMSIZ - 2);
+=09comm[COMSIZ - 2] =3D '\0';
+=09(void) strncat(comm, &wrapper[1], COMSIZ - 1);
+=09comm[COMSIZ - 1] =3D '\0';
+    }
+
+    /*
+     * Convert the process's runtime from microseconds to seconds.  This
+     * time includes the interrupt time although that is not wanted here.
+     * ps(1) is similarly sloppy.
+     */
+    cputime =3D (LP(pp, uticks) + LP(pp, sticks)) / 1000000;
+
+    /* calculate the base for cpu percentages */
+    pct =3D pctdouble(LP(pp, pctcpu));
+
+    /* generate "STATE" field */
+    switch (state =3D LP(pp, stat)) {
+=09case LSRUN:
+=09    if (smpmode && LP(pp, tdflags) & TDF_RUNNING)
+=09=09sprintf(status, "CPU%d", LP(pp, cpuid));
+=09    else
+=09=09strcpy(status, "RUN");
+=09    break;
+=09case LSSLEEP:
+=09    if (LP(pp, wmesg) !=3D NULL) {
+=09=09sprintf(status, "%.6s", LP(pp, wmesg));
+=09=09break;
+=09    }
+=09    /* fall through */
+=09default:
+
+=09    if (state >=3D 0 &&
+=09        (unsigned)state < sizeof(state_abbrev) / sizeof(*state_abbrev))
+=09=09    sprintf(status, "%.6s", state_abbrev[(unsigned char) state]);
+=09    else
+=09=09    sprintf(status, "?%5d", state);
+=09    break;
+    }
+
+    if (PP(pp, stat) =3D=3D SZOMB)
+=09    strcpy(status, "ZOMB");
+
+    /*
+     * idle time 0 - 31 -> nice value +21 - +52
+     * normal time      -> nice value -20 - +20
+     * real time 0 - 31 -> nice value -52 - -21
+     * thread    0 - 31 -> nice value -53 -
+     */
+    switch(LP(pp, rtprio.type)) {
+    case RTP_PRIO_REALTIME:
+=09xnice =3D PRIO_MIN - 1 - RTP_PRIO_MAX + LP(pp, rtprio.prio);
+=09break;
+    case RTP_PRIO_IDLE:
+=09xnice =3D PRIO_MAX + 1 + LP(pp, rtprio.prio);
+=09break;
+    case RTP_PRIO_THREAD:
+=09xnice =3D PRIO_MIN - 1 - RTP_PRIO_MAX - LP(pp, rtprio.prio);
+=09break;
+    default:
+=09xnice =3D PP(pp, nice);
+=09break;
+    }
+
+    /* format this entry */
+    snprintf(fmt, sizeof(fmt),
+=09    smpmode ? smp_Proc_format : up_Proc_format,
+=09    (int)PP(pp, pid),
+=09    namelength, namelength,
+=09    get_userid(PP(pp, ruid)),
+=09    (int)((show_threads && (LP(pp, pid) =3D=3D -1)) ?
+=09=09    LP(pp, tdprio) : LP(pp, prio)),
+=09    (int)xnice,
+=09    format_k(PROCSIZE(pp)),
+=09    format_k(pagetok(VP(pp, rssize))),
+=09    status,
+=09    (int)(smpmode ? LP(pp, cpuid) : 0),
+=09    format_time(cputime),
+=09    100.0 * weighted_cpu(pct, pp),
+=09    100.0 * pct,
+=09    cmdlength,
+=09    printable(PP(pp, comm)));
+
+    /* return the result */
+    return(fmt);
+}
+
+#if 0
+/*
+ * check_nlist(nlst) - checks the nlist to see if any symbols were not
+ *=09=09found.  For every symbol that was not found, a one-line
+ *=09=09message is printed to stderr.  The routine returns the
+ *=09=09number of symbols NOT found.
+ */
+static int
+check_nlist(struct nlist *nlst)
+{
+    int i;
+
+    /* check to see if we got ALL the symbols we requested */
+    /* this will write one line to stderr for every symbol not found */
+
+    i =3D 0;
+    while (nlst->n_name !=3D NULL)
+    {
+=09if (nlst->n_type =3D=3D 0)
+=09{
+=09    /* this one wasn't found */
+=09    (void) fprintf(stderr, "kernel: no symbol named `%s'\n",
+=09=09=09   nlst->n_name);
+=09    i =3D 1;
+=09}
+=09nlst++;
+    }
+
+    return(i);
+}
+#endif
+
+/* comparison routines for qsort */
+
+/*
+ *  proc_compare - comparison function for "qsort"
+ *=09Compares the resource consumption of two processes using five
+ *  =09distinct keys.  The keys (in descending order of importance) are:
+ *  =09percent cpu, cpu ticks, state, resident set size, total virtual
+ *  =09memory usage.  The process states are ordered as follows (from least
+ *  =09to most important):  WAIT, zombie, sleep, stop, start, run.  The
+ *  =09array declaration below maps a process state index into a number
+ *  =09that reflects this ordering.
+ */
+
+static unsigned char sorted_state[] =3D
+{
+    0,=09/* not used=09=09*/
+    3,=09/* sleep=09=09*/
+    1,=09/* ABANDONED (WAIT)=09*/
+    6,=09/* run=09=09=09*/
+    5,=09/* start=09=09*/
+    2,=09/* zombie=09=09*/
+    4=09/* stop=09=09=09*/
+};
+
+
+#define ORDERKEY_PCTCPU \
+  if (lresult =3D (long) LP(p2, pctcpu) - (long) LP(p1, pctcpu), \
+     (result =3D lresult > 0 ? 1 : lresult < 0 ? -1 : 0) =3D=3D 0)
+
+#define CPTICKS(p)=09(LP(p, uticks) + LP(p, sticks))
+
+#define ORDERKEY_CPTICKS \
+  if ((result =3D CPTICKS(p2) > CPTICKS(p1) ? 1 : \
+=09=09CPTICKS(p2) < CPTICKS(p1) ? -1 : 0) =3D=3D 0)
+
+#define ORDERKEY_STATE \
+  if ((result =3D sorted_state[(unsigned char) PP(p2, stat)] - \
+                sorted_state[(unsigned char) PP(p1, stat)]) =3D=3D 0)
+
+#define ORDERKEY_PRIO \
+  if ((result =3D LP(p2, prio) - LP(p1, prio)) =3D=3D 0)
+
+#define ORDERKEY_KTHREADS \
+  if ((result =3D (LP(p1, pid) =3D=3D 0) - (LP(p2, pid) =3D=3D 0)) =3D=3D 0=
)
+
+#define ORDERKEY_KTHREADS_PRIO \
+  if ((result =3D LP(p2, tdprio) - LP(p1, tdprio)) =3D=3D 0)
+
+#define ORDERKEY_RSSIZE \
+  if ((result =3D VP(p2, rssize) - VP(p1, rssize)) =3D=3D 0)
+
+#define ORDERKEY_MEM \
+  if ( (result =3D PROCSIZE(p2) - PROCSIZE(p1)) =3D=3D 0 )
+
+/* compare_cpu - the comparison function for sorting by cpu percentage */
+
+int
+/* compare_cpu(const void *arg1, const void *arg2) */
+proc_compare(const void *arg1, const void *arg2)
+{
+    const struct proc *const*pp1 =3D arg1;
+    const struct proc *const*pp2 =3D arg2;
+    const struct kinfo_proc *p1;
+    const struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
+
+    /* remove one level of indirection */
+    p1 =3D *(const struct kinfo_proc *const *) pp1;
+    p2 =3D *(const struct kinfo_proc *const *) pp2;
+
+    ORDERKEY_PCTCPU
+    ORDERKEY_CPTICKS
+    ORDERKEY_STATE
+    ORDERKEY_PRIO
+    ORDERKEY_RSSIZE
+    ORDERKEY_MEM
+    {}
+
+    return(result);
+}
+
+/* compare_size - the comparison function for sorting by total memory =20
usage */
+
+int
+compare_size(const void *arg1, const void *arg2)
+{
+    struct proc *const *pp1 =3D arg1;
+    struct proc *const *pp2 =3D arg2;
+    struct kinfo_proc *p1;
+    struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
+
+    /* remove one level of indirection */
+    p1 =3D *(struct kinfo_proc *const*) pp1;
+    p2 =3D *(struct kinfo_proc *const*) pp2;
+
+    ORDERKEY_MEM
+    ORDERKEY_RSSIZE
+    ORDERKEY_PCTCPU
+    ORDERKEY_CPTICKS
+    ORDERKEY_STATE
+    ORDERKEY_PRIO
+    {}
+
+    return(result);
+}
+
+/* compare_res - the comparison function for sorting by resident set size *=
/
+
+int
+compare_res(const void *arg1, const void *arg2)
+{
+    struct proc *const *pp1 =3D arg1;
+    struct proc *const *pp2 =3D arg2;
+    struct kinfo_proc *p1;
+    struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
+
+    /* remove one level of indirection */
+    p1 =3D *(struct kinfo_proc *const*) pp1;
+    p2 =3D *(struct kinfo_proc *const*) pp2;
+
+    ORDERKEY_RSSIZE
+    ORDERKEY_MEM
+    ORDERKEY_PCTCPU
+    ORDERKEY_CPTICKS
+    ORDERKEY_STATE
+    ORDERKEY_PRIO
+    {}
+
+    return(result);
+}
+
+/* compare_time - the comparison function for sorting by total cpu time */
+
+int
+compare_time(const void *arg1, const void *arg2)
+{
+    struct proc *const *pp1 =3D arg1;
+    struct proc *const *pp2 =3D arg2;
+    const struct kinfo_proc *p1;
+    const struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
+
+    /* remove one level of indirection */
+    p1 =3D *(struct kinfo_proc *const*) pp1;
+    p2 =3D *(struct kinfo_proc *const*) pp2;
+
+    ORDERKEY_CPTICKS
+    ORDERKEY_PCTCPU
+    ORDERKEY_KTHREADS
+    ORDERKEY_KTHREADS_PRIO
+    ORDERKEY_STATE
+    ORDERKEY_PRIO
+    ORDERKEY_RSSIZE
+    ORDERKEY_MEM
+    {}
+
+      return(result);
+  }
+
+/* compare_prio - the comparison function for sorting by cpu percentage */
+
+int
+compare_prio(const void *arg1, const void *arg2)
+{
+    struct proc *const *pp1 =3D arg1;
+    struct proc *const *pp2 =3D arg2;
+    const struct kinfo_proc *p1;
+    const struct kinfo_proc *p2;
+    int result;
+    pctcpu lresult;
+
+    /* remove one level of indirection */
+    p1 =3D *(struct kinfo_proc *const*) pp1;
+    p2 =3D *(struct kinfo_proc *const*) pp2;
+
+    ORDERKEY_KTHREADS
+    ORDERKEY_KTHREADS_PRIO
+    ORDERKEY_PRIO
+    ORDERKEY_CPTICKS
+    ORDERKEY_PCTCPU
+    ORDERKEY_STATE
+    ORDERKEY_RSSIZE
+    ORDERKEY_MEM
+    {}
+
+    return(result);
+}
+
+int
+compare_thr(const void *arg1, const void *arg2)
+{
+    struct proc *const *pp1 =3D arg1;
+    struct proc *const *pp2 =3D arg2;
+    const struct kinfo_proc *p1;
+    int result;
+    pctcpu lresult;
+
+    /* remove one level of indirection */
+    p1 =3D *(struct kinfo_proc *const*) pp1;
+    p2 =3D *(struct kinfo_proc *const*) pp2;
+
+    ORDERKEY_KTHREADS
+    ORDERKEY_KTHREADS_PRIO
+    ORDERKEY_CPTICKS
+    ORDERKEY_PCTCPU
+    ORDERKEY_STATE
+    ORDERKEY_RSSIZE
+    ORDERKEY_MEM
+    {}
+
+    return(result);
+}
+
+/*
+ * proc_owner(pid) - returns the uid that owns process "pid", or -1 if
+ *=09=09the process does not exist.
+ *=09=09It is EXTREMLY IMPORTANT that this function work correctly.
+ *=09=09If top runs setuid root (as in SVR4), then this function
+ *=09=09is the only thing that stands in the way of a serious
+ *=09=09security problem.  It validates requests for the "kill"
+ *=09=09and "renice" commands.
+ */
+
+int
+proc_owner(int pid)
+{
+    int xcnt;
+    struct kinfo_proc **prefp;
+    struct kinfo_proc *pp;
+
+    prefp =3D pref;
+    xcnt =3D pref_len;
+    while (--xcnt >=3D 0)
+    {
+=09pp =3D *prefp++;
+=09if (PP(pp, pid) =3D=3D (pid_t)pid)
+=09{
+=09    return((int)PP(pp, ruid));
+=09}
+    }
+    return(-1);
+}
+
+
+/*
+ * swapmode is based on a program called swapinfo written
+ * by Kevin Lahey <[e-mail]>.
+ */
+int
+swapmode(int *retavail, int *retfree)
+{
+=09int n;
+=09int pagesize =3D getpagesize();
+=09struct kvm_swap swapary[1];
+
+=09*retavail =3D 0;
+=09*retfree =3D 0;
+
+#define CONVERT(v)=09((quad_t)(v) * pagesize / 1024)
+
+=09n =3D kvm_getswapinfo(kd, swapary, 1, 0);
+=09if (n < 0 || swapary[0].ksw_total =3D=3D 0)
+=09=09return(0);
+
+=09*retavail =3D CONVERT(swapary[0].ksw_total);
+=09*retfree =3D CONVERT(swapary[0].ksw_total - swapary[0].ksw_used);
+
+=09n =3D (int)((double)swapary[0].ksw_used * 100.0 /
+=09    (double)swapary[0].ksw_total);
+=09return(n);
+}



----- Ende der weitergeleiteten Nachricht -----


----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.