OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 05-Oct-2003 17:18:05
Branch: HEAD Handle: 2003100516180202
Added files:
openpkg-re/vcheck vc.top
openpkg-src/top top.patch top.spec
Modified files:
openpkg-web news.txt
Log:
new package: top 3.5b12.7 (Full-Screen Process Display)
Summary:
Revision Changes Path
1.1 +9 -0 openpkg-re/vcheck/vc.top
1.1 +1050 -0 openpkg-src/top/top.patch
1.1 +123 -0 openpkg-src/top/top.spec
1.6861 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.top
============================================================================
$ cvs diff -u -r0 -r1.1 vc.top
--- /dev/null 2003-10-05 17:18:02.000000000 +0200
+++ vc.top 2003-10-05 17:18:02.000000000 +0200
@@ -0,0 +1,9 @@
+config = {
+}
+
+prog top = {
+ version = 3.5beta12.7
+ url = http://www.spang.uk.eu.org/top/
+ regex = top-(__VER__)\.tar\.gz
+}
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/top/top.patch
============================================================================
$ cvs diff -u -r0 -r1.1 top.patch
--- /dev/null 2003-10-05 17:18:05.000000000 +0200
+++ top.patch 2003-10-05 17:18:05.000000000 +0200
@@ -0,0 +1,1050 @@
+Index: machine/m_freebsd4.c
+--- machine/m_freebsd4.c.orig 2003-10-05 16:52:21.000000000 +0200
++++ machine/m_freebsd4.c 2003-10-05 16:52:21.000000000 +0200
+@@ -0,0 +1,1017 @@
++/*
++ * top - a top users display for Unix
++ *
++ * SYNOPSIS: For FreeBSD-4.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 http://www.groupsys.com/topinfo/)
++ *
++ * This is the machine-dependent module for FreeBSD 2.2
++ * Works for:
++ * FreeBSD 2.2.x, 3.x, 4.x, and probably FreeBSD 2.1.x
++ *
++ * LIBS: -lkvm
++ *
++ * AUTHOR: Christos Zoulas <[EMAIL PROTECTED]>
++ * Steven Wallace <[EMAIL PROTECTED]>
++ * Wolfram Schneider <[EMAIL PROTECTED]>
++ *
++ * $FreeBSD: src/usr.bin/top/machine.c,v 1.29.2.2 2001/07/31 20:27:05 tmm Exp $
++ */
++
++
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/signal.h>
++#include <sys/param.h>
++
++#include "os.h"
++#include <stdio.h>
++#include <nlist.h>
++#include <math.h>
++#include <kvm.h>
++#include <pwd.h>
++#include <sys/errno.h>
++#include <sys/sysctl.h>
++#include <sys/dkstat.h>
++#include <sys/file.h>
++#include <sys/time.h>
++#include <sys/proc.h>
++#include <sys/user.h>
++#include <sys/vmmeter.h>
++#include <sys/resource.h>
++#include <sys/rtprio.h>
++
++/* Swap */
++#include <stdlib.h>
++#include <sys/conf.h>
++
++#include <osreldate.h> /* for changes in kernel structures */
++
++#include "top.h"
++#include "machine.h"
++
++static int check_nlist __P((struct nlist *));
++static int getkval __P((unsigned long, int *, int, char *));
++extern char* printable __P((char *));
++int swapmode __P((int *retavail, int *retfree));
++static int smpmode;
++static int namelength;
++static int cmdlength;
++
++
++/* get_process_info passes back a handle. This is what it looks like: */
++
++struct handle
++{
++ struct kinfo_proc **next_proc; /* points to next valid proc pointer */
++ int remaining; /* number of pointers remaining */
++};
++
++/* declarations for load_avg */
++#include "loadavg.h"
++
++#define PP(pp, field) ((pp)->kp_proc . field)
++#define EP(pp, field) ((pp)->kp_eproc . field)
++#define VP(pp, field) ((pp)->kp_eproc.e_vm . field)
++
++/* define what weighted cpu is. */
++#define weighted_cpu(pct, pp) (PP((pp), p_swtime) == 0 ? 0.0 : \
++ ((pct) / (1.0 - exp(PP((pp), p_swtime) * logcpu))))
++
++/* what we consider to be process size: */
++#define PROCSIZE(pp) (VP((pp), vm_map.size) / 1024)
++
++/* definitions for indices in the nlist array */
++
++static struct nlist nlst[] = {
++#define X_CCPU 0
++ { "_ccpu" },
++#define X_CP_TIME 1
++ { "_cp_time" },
++#define X_AVENRUN 2
++ { "_averunnable" },
++
++#define X_BUFSPACE 3
++ { "_bufspace" }, /* K in buffer cache */
++#define X_CNT 4
++ { "_cnt" }, /* struct vmmeter cnt */
++
++/* Last pid */
++#define X_LASTPID 5
++ { "_nextpid" },
++ { 0 }
++};
++
++/*
++ * These definitions control the format of the per-process area
++ */
++
++static char smp_header[] =
++ " PID %-*.*s PRI NICE SIZE RES STATE C TIME WCPU CPU COMMAND";
++
++#define smp_Proc_format \
++ "%5d %-*.*s %3d %3d%7s %6s %-6.6s %1x%7s %5.2f%% %5.2f%% %.*s"
++
++static char up_header[] =
++ " PID %-*.*s PRI NICE SIZE RES STATE TIME WCPU CPU COMMAND";
++
++#define up_Proc_format \
++ "%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 */
++
++char *state_abbrev[] =
++{
++ "", "START", "RUN\0\0\0", "SLEEP", "STOP", "ZOMB",
++};
++
++
++static kvm_t *kd;
++
++/* values that we stash away in _init and use in later routines */
++
++static double logcpu;
++
++/* these are retrieved from the kernel in _init */
++
++static load_avg ccpu;
++
++/* these are offsets obtained via nlist and used in the get_ functions */
++
++static unsigned long cp_time_offset;
++static unsigned long avenrun_offset;
++static unsigned long lastpid_offset;
++static long lastpid;
++static unsigned long cnt_offset;
++static unsigned long bufspace_offset;
++static long cnt;
++
++/* these are for calculating cpu state percentages */
++
++static long cp_time[CPUSTATES];
++static long cp_old[CPUSTATES];
++static long cp_diff[CPUSTATES];
++
++/* these are for detailing the process states */
++
++int process_states[6];
++char *procstatenames[] = {
++ "", " starting, ", " running, ", " sleeping, ", " stopped, ",
++ " zombie, ",
++ NULL
++};
++
++/* these are for detailing the cpu states */
++
++int cpu_states[CPUSTATES];
++char *cpustatenames[] = {
++ "user", "nice", "system", "interrupt", "idle", NULL
++};
++
++/* these are for detailing the memory statistics */
++
++int memory_stats[7];
++char *memorynames[] = {
++ "K Active, ", "K Inact, ", "K Wired, ", "K Cache, ", "K Buf, ", "K Free",
++ NULL
++};
++
++int swap_stats[7];
++#if 0 /* RSE */
++char *swapnames[] = {
++/* 0 1 2 3 4 5 */
++ "K Total, ", "K Used, ", "K Free, ", "% Inuse, ", "K In, ", "K Out",
++ NULL
++};
++#endif
++
++/* these are for keeping track of the proc array */
++
++static int nproc;
++static int onproc = -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; /* log base 2 of the pagesize */
++
++/* define pagetok in terms of pageshift */
++
++#define pagetok(size) ((size) << pageshift)
++
++/* useful externals */
++long percentages();
++
++#ifdef ORDER
++/* sorting orders. first is default */
++char *ordernames[] = {
++ "cpu", "size", "res", "time", "pri", NULL
++};
++#endif
++
++#ifdef COLOUR
++char *colournames[] =
++ { "host", "1min", "5min", "15min", "cpu", "size", "res", "time", "flts", NULL };
++#endif
++
++int
++machine_init(statics)
++
++struct statics *statics;
++
++{
++ register int i = 0;
++ register int pagesize;
++ size_t modelen;
++ struct passwd *pw;
++
++ modelen = sizeof(smpmode);
++ if ((sysctlbyname("machdep.smp_active", &smpmode, &modelen, NULL, 0) < 0 &&
++ sysctlbyname("smp.smp_active", &smpmode, &modelen, NULL, 0) < 0) ||
++ modelen != sizeof(smpmode))
++ smpmode = 0;
++
++ while ((pw = getpwent()) != NULL) {
++ if (strlen(pw->pw_name) > namelength)
++ namelength = strlen(pw->pw_name);
++ }
++ if (namelength < 8)
++ namelength = 8;
++ if (smpmode && namelength > 13)
++ namelength = 13;
++ else if (namelength > 15)
++ namelength = 15;
++
++ if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL)
++ return -1;
++
++
++ /* get the list of symbols we want to access in the kernel */
++ (void) kvm_nlist(kd, nlst);
++ if (nlst[0].n_type == 0)
++ {
++ fprintf(stderr, "top: nlist failed\n");
++ return(-1);
++ }
++
++ /* make sure they were all found */
++ if (i > 0 && check_nlist(nlst) > 0)
++ {
++ return(-1);
++ }
++
++ (void) getkval(nlst[X_CCPU].n_value, (int *)(&ccpu), sizeof(ccpu),
++ nlst[X_CCPU].n_name);
++
++ /* stash away certain offsets for later use */
++ cp_time_offset = nlst[X_CP_TIME].n_value;
++ avenrun_offset = nlst[X_AVENRUN].n_value;
++ lastpid_offset = nlst[X_LASTPID].n_value;
++ cnt_offset = nlst[X_CNT].n_value;
++ bufspace_offset = nlst[X_BUFSPACE].n_value;
++
++ /* this is used in calculating WCPU -- calculate it ahead of time */
++ logcpu = log(loaddouble(ccpu));
++
++ pbase = NULL;
++ pref = NULL;
++ nproc = 0;
++ onproc = -1;
++ /* get the page size with "getpagesize" and calculate pageshift from it */
++ pagesize = getpagesize();
++ pageshift = 0;
++ while (pagesize > 1)
++ {
++ pageshift++;
++ pagesize >>= 1;
++ }
++
++ /* we only need the amount of log(2)1024 for our conversion */
++ pageshift -= LOG1024;
++
++ /* fill in the statics information */
++ statics->procstate_names = procstatenames;
++ statics->cpustate_names = cpustatenames;
++ statics->memory_names = memorynames;
++#if 0 /* RSE */
++ statics->swap_names = swapnames;
++#endif
++#ifdef ORDER
++ statics->order_names = ordernames;
++#endif
++#ifdef COLOUR
++ statics->colour_names = colournames;
++#endif
++
++ /* all done! */
++ return(0);
++}
++
++char *format_header(uname_field)
++
++register char *uname_field;
++
++{
++ register char *ptr;
++ static char Header[128];
++
++ snprintf(Header, sizeof(Header), smpmode ? smp_header : up_header,
++ namelength, namelength, uname_field);
++
++ cmdlength = 80 - strlen(Header) + 6;
++
++ return Header;
++}
++
++static int swappgsin = -1;
++static int swappgsout = -1;
++extern struct timeval timeout;
++
++void
++get_system_info(si)
++
++struct system_info *si;
++
++{
++ long total;
++ load_avg avenrun[3];
++ int mib[2];
++ struct timeval boottime;
++ size_t bt_size;
++
++ /* get the cp_time array */
++ (void) getkval(cp_time_offset, (int *)cp_time, sizeof(cp_time),
++ nlst[X_CP_TIME].n_name);
++ (void) getkval(avenrun_offset, (int *)avenrun, sizeof(avenrun),
++ nlst[X_AVENRUN].n_name);
++
++ (void) getkval(lastpid_offset, (int *)(&lastpid), sizeof(lastpid),
++ "!");
++
++ /* convert load averages to doubles */
++ {
++ register int i;
++ register double *infoloadp;
++ load_avg *avenrunp;
++
++#ifdef notyet
++ struct loadavg sysload;
++ int size;
++ getkerninfo(KINFO_LOADAVG, &sysload, &size, 0);
++#endif
++
++ infoloadp = si->load_avg;
++ avenrunp = avenrun;
++ for (i = 0; i < 3; i++)
++ {
++#ifdef notyet
++ *infoloadp++ = ((double) sysload.ldavg[i]) / sysload.fscale;
++#endif
++ *infoloadp++ = loaddouble(*avenrunp++);
++ }
++ }
++
++ /* convert cp_time counts to percentages */
++ total = percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff);
++
++ /* sum memory & swap statistics */
++ {
++ struct vmmeter sum;
++ static unsigned int swap_delay = 0;
++ static int swapavail = 0;
++ static int swapfree = 0;
++ static int bufspace = 0;
++
++ (void) getkval(cnt_offset, (int *)(&sum), sizeof(sum),
++ "_cnt");
++ (void) getkval(bufspace_offset, (int *)(&bufspace), sizeof(bufspace),
++ "_bufspace");
++
++ /* convert memory stats to Kbytes */
++ memory_stats[0] = pagetok(sum.v_active_count);
++ memory_stats[1] = pagetok(sum.v_inactive_count);
++ memory_stats[2] = pagetok(sum.v_wire_count);
++ memory_stats[3] = pagetok(sum.v_cache_count);
++ memory_stats[4] = bufspace / 1024;
++ memory_stats[5] = pagetok(sum.v_free_count);
++ memory_stats[6] = -1;
++
++ /* first interval */
++ if (swappgsin < 0) {
++ swap_stats[4] = 0;
++ swap_stats[5] = 0;
++ }
++
++ /* compute differences between old and new swap statistic */
++ else {
++ swap_stats[4] = pagetok(((sum.v_swappgsin - swappgsin)));
++ swap_stats[5] = pagetok(((sum.v_swappgsout - swappgsout)));
++ }
++
++ swappgsin = sum.v_swappgsin;
++ swappgsout = sum.v_swappgsout;
++
++ /* call CPU heavy swapmode() only for changes */
++ if (swap_stats[4] > 0 || swap_stats[5] > 0 || swap_delay == 0) {
++ swap_stats[3] = swapmode(&swapavail, &swapfree);
++ swap_stats[0] = swapavail;
++ swap_stats[1] = swapavail - swapfree;
++ swap_stats[2] = swapfree;
++ }
++ swap_delay = 1;
++ swap_stats[6] = -1;
++ }
++
++ /* set arrays and strings */
++ si->cpustates = cpu_states;
++ si->memory = memory_stats;
++#if 0 /* RSE */
++ si->swap = swap_stats;
++#endif
++
++
++ if(lastpid > 0) {
++ si->last_pid = lastpid;
++ } else {
++ si->last_pid = -1;
++ }
++
++ /*
++ * Print how long system has been up.
++ * (Found by looking getting "boottime" from the kernel)
++ */
++#if 0 /* RSE */
++ mib[0] = CTL_KERN;
++ mib[1] = KERN_BOOTTIME;
++ bt_size = sizeof(boottime);
++ if (sysctl(mib, 2, &boottime, &bt_size, NULL, 0) != -1 &&
++ boottime.tv_sec != 0) {
++ si->boottime = boottime;
++ } else {
++ si->boottime.tv_sec = -1;
++ }
++#endif
++}
++
++static struct handle handle;
++
++caddr_t get_process_info(si, sel, compare)
++
++struct system_info *si;
++struct process_select *sel;
++int (*compare)();
++
++{
++ 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;
++ int show_command;
++
++
++ pbase = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc);
++ if (nproc > onproc)
++ pref = (struct kinfo_proc **) realloc(pref, sizeof(struct kinfo_proc *)
++ * (onproc = nproc));
++ if (pref == NULL || pbase == NULL) {
++ (void) fprintf(stderr, "top: Out of memory.\n");
++ quit(23);
++ }
++ /* get a pointer to the states summary array */
++ si->procstates = process_states;
++
++ /* set up flags which define what we are going to select */
++ show_idle = sel->idle;
++#if 0 /* RSE */
++ show_self = sel->self;
++#endif
++ show_system = sel->system;
++ show_uid = sel->uid != -1;
++ show_command = sel->command != NULL;
++
++ /* count up process states and get pointers to interesting procs */
++ total_procs = 0;
++ active_procs = 0;
++ memset((char *)process_states, 0, sizeof(process_states));
++ prefp = pref;
++ for (pp = pbase, i = 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.
++ */
++ if (PP(pp, p_stat) != 0 &&
++ (show_self != PP(pp, p_pid)) &&
++ (show_system || ((PP(pp, p_flag) & P_SYSTEM) == 0)))
++ {
++ total_procs++;
++ process_states[(unsigned char) PP(pp, p_stat)]++;
++ if ((PP(pp, p_stat) != SZOMB) &&
++ (show_idle || (PP(pp, p_pctcpu) != 0) ||
++ (PP(pp, p_stat) == SRUN)) &&
++ (!show_uid || EP(pp, e_pcred.p_ruid) == (uid_t)sel->uid))
++ {
++ *prefp++ = pp;
++ active_procs++;
++ }
++ }
++ }
++
++ /* if requested, sort the "interesting" processes */
++ if (compare != NULL)
++ {
++ qsort((char *)pref, active_procs, sizeof(struct kinfo_proc *), compare);
++ }
++
++ /* remember active and total counts */
++ si->p_total = total_procs;
++ si->p_active = pref_len = active_procs;
++
++ /* pass back a handle */
++ handle.next_proc = pref;
++ handle.remaining = active_procs;
++ return((caddr_t)&handle);
++}
++
++char fmt[128]; /* static area where result is built */
++
++char *format_next_process(handle, get_userid)
++
++caddr_t handle;
++char *(*get_userid)();
++
++{
++ register struct kinfo_proc *pp;
++ register long cputime;
++ register double pct;
++ struct handle *hp;
++ char status[16];
++ int state;
++
++ /* find and remember the next proc structure */
++ hp = (struct handle *)handle;
++ pp = *(hp->next_proc++);
++ hp->remaining--;
++
++ /* get the process's command name */
++ if ((PP(pp, p_flag) & P_INMEM) == 0) {
++ /*
++ * Print swapped processes as <pname>
++ */
++ char *comm = PP(pp, p_comm);
++#define COMSIZ sizeof(PP(pp, p_comm))
++ char buf[COMSIZ];
++ (void) strncpy(buf, comm, COMSIZ);
++ comm[0] = '<';
++ (void) strncpy(&comm[1], buf, COMSIZ - 2);
++ comm[COMSIZ - 2] = '\0';
++ (void) strncat(comm, ">", COMSIZ - 1);
++ comm[COMSIZ - 1] = '\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 = (PP(pp, p_runtime) + 500000) / 1000000;
++
++ /* calculate the base for cpu percentages */
++ pct = pctdouble(PP(pp, p_pctcpu));
++
++ /* generate "STATE" field */
++ switch (state = PP(pp, p_stat)) {
++ case SRUN:
++ if (smpmode && PP(pp, p_oncpu) != 0xff)
++ sprintf(status, "CPU%d", PP(pp, p_oncpu));
++ else
++ strcpy(status, "RUN");
++ break;
++ case SSLEEP:
++ if (PP(pp, p_wmesg) != NULL) {
++ sprintf(status, "%.6s", EP(pp, e_wmesg));
++ break;
++ }
++ /* fall through */
++ default:
++
++ if (state >= 0 &&
++ state < sizeof(state_abbrev) / sizeof(*state_abbrev))
++ sprintf(status, "%.6s", state_abbrev[(unsigned char) state]);
++ else
++ sprintf(status, "?%5d", state);
++ break;
++ }
++
++ /* format this entry */
++ sprintf(fmt,
++ smpmode ? smp_Proc_format : up_Proc_format,
++ PP(pp, p_pid),
++ namelength, namelength,
++ (*get_userid)(EP(pp, e_pcred.p_ruid)),
++ PP(pp, p_priority) - PZERO,
++
++ /*
++ * normal time -> nice value -20 - +20
++ * real time 0 - 31 -> nice value -52 - -21
++ * idle time 0 - 31 -> nice value +21 - +52
++ */
++ (PP(pp, p_rtprio.type) == RTP_PRIO_NORMAL ?
++ PP(pp, p_nice) - NZERO :
++ (RTP_PRIO_IS_REALTIME(PP(pp, p_rtprio.type)) ?
++ (PRIO_MIN - 1 - RTP_PRIO_MAX + PP(pp, p_rtprio.prio)) :
++ (PRIO_MAX + 1 + PP(pp, p_rtprio.prio)))),
++ format_k(PROCSIZE(pp)),
++ format_k(pagetok(VP(pp, vm_rssize))),
++ status,
++ smpmode ? PP(pp, p_lastcpu) : 0,
++ format_time(cputime),
++ 100.0 * weighted_cpu(pct, pp),
++ 100.0 * pct,
++ cmdlength,
++ printable(PP(pp, p_comm)));
++
++ /* return the result */
++ return(fmt);
++}
++
++
++/*
++ * check_nlist(nlst) - checks the nlist to see if any symbols were not
++ * found. For every symbol that was not found, a one-line
++ * message is printed to stderr. The routine returns the
++ * number of symbols NOT found.
++ */
++
++static int check_nlist(nlst)
++
++register struct nlist *nlst;
++
++{
++ register 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 = 0;
++ while (nlst->n_name != NULL)
++ {
++ if (nlst->n_type == 0)
++ {
++ /* this one wasn't found */
++ (void) fprintf(stderr, "kernel: no symbol named `%s'\n",
++ nlst->n_name);
++ i = 1;
++ }
++ nlst++;
++ }
++
++ return(i);
++}
++
++
++/*
++ * getkval(offset, ptr, size, refstr) - get a value out of the kernel.
++ * "offset" is the byte offset into the kernel for the desired value,
++ * "ptr" points to a buffer into which the value is retrieved,
++ * "size" is the size of the buffer (and the object to retrieve),
++ * "refstr" is a reference string used when printing error meessages,
++ * if "refstr" starts with a '!', then a failure on read will not
++ * be fatal (this may seem like a silly way to do things, but I
++ * really didn't want the overhead of another argument).
++ *
++ */
++
++static int getkval(offset, ptr, size, refstr)
++
++unsigned long offset;
++int *ptr;
++int size;
++char *refstr;
++
++{
++ if (kvm_read(kd, offset, (char *) ptr, size) != size)
++ {
++ if (*refstr == '!')
++ {
++ return(0);
++ }
++ else
++ {
++ fprintf(stderr, "top: kvm_read for %s: %s\n",
++ refstr, strerror(errno));
++ quit(23);
++ }
++ }
++ return(1);
++}
++
++/* comparison routines for qsort */
++
++/*
++ * proc_compare - comparison function for "qsort"
++ * Compares the resource consumption of two processes using five
++ * distinct keys. The keys (in descending order of importance) are:
++ * percent cpu, cpu ticks, state, resident set size, total virtual
++ * memory usage. The process states are ordered as follows (from least
++ * to most important): WAIT, zombie, sleep, stop, start, run. The
++ * array declaration below maps a process state index into a number
++ * that reflects this ordering.
++ */
++
++static unsigned char sorted_state[] =
++{
++ 0, /* not used */
++ 3, /* sleep */
++ 1, /* ABANDONED (WAIT) */
++ 6, /* run */
++ 5, /* start */
++ 2, /* zombie */
++ 4 /* stop */
++};
++
++
++#define ORDERKEY_PCTCPU \
++ if (lresult = (long) PP(p2, p_pctcpu) - (long) PP(p1, p_pctcpu), \
++ (result = lresult > 0 ? 1 : lresult < 0 ? -1 : 0) == 0)
++
++#define ORDERKEY_CPTICKS \
++ if ((result = PP(p2, p_runtime) > PP(p1, p_runtime) ? 1 : \
++ PP(p2, p_runtime) < PP(p1, p_runtime) ? -1 : 0) == 0)
++
++#define ORDERKEY_STATE \
++ if ((result = sorted_state[(unsigned char) PP(p2, p_stat)] - \
++ sorted_state[(unsigned char) PP(p1, p_stat)]) == 0)
++
++#define ORDERKEY_PRIO \
++ if ((result = PP(p2, p_priority) - PP(p1, p_priority)) == 0)
++
++#define ORDERKEY_RSSIZE \
++ if ((result = VP(p2, vm_rssize) - VP(p1, vm_rssize)) == 0)
++
++#define ORDERKEY_MEM \
++ if ( (result = PROCSIZE(p2) - PROCSIZE(p1)) == 0 )
++
++/* compare_cpu - the comparison function for sorting by cpu percentage */
++
++int
++#ifdef ORDER
++compare_cpu(pp1, pp2)
++#else
++proc_compare(pp1, pp2)
++#endif
++
++struct proc **pp1;
++struct proc **pp2;
++
++{
++ register struct kinfo_proc *p1;
++ register struct kinfo_proc *p2;
++ register int result;
++ register pctcpu lresult;
++
++ /* remove one level of indirection */
++ p1 = *(struct kinfo_proc **) pp1;
++ p2 = *(struct kinfo_proc **) pp2;
++
++ ORDERKEY_PCTCPU
++ ORDERKEY_CPTICKS
++ ORDERKEY_STATE
++ ORDERKEY_PRIO
++ ORDERKEY_RSSIZE
++ ORDERKEY_MEM
++ ;
++
++ return(result);
++}
++
++#ifdef ORDER
++/* compare routines */
++int compare_size(), compare_res(), compare_time(), compare_prio();
++
++int (*proc_compares[])() = {
++ compare_cpu,
++ compare_size,
++ compare_res,
++ compare_time,
++ compare_prio,
++ NULL
++};
++
++/* compare_size - the comparison function for sorting by total memory usage */
++
++int
++compare_size(pp1, pp2)
++
++struct proc **pp1;
++struct proc **pp2;
++
++{
++ register struct kinfo_proc *p1;
++ register struct kinfo_proc *p2;
++ register int result;
++ register pctcpu lresult;
++
++ /* remove one level of indirection */
++ p1 = *(struct kinfo_proc **) pp1;
++ p2 = *(struct kinfo_proc **) 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(pp1, pp2)
++
++struct proc **pp1;
++struct proc **pp2;
++
++{
++ register struct kinfo_proc *p1;
++ register struct kinfo_proc *p2;
++ register int result;
++ register pctcpu lresult;
++
++ /* remove one level of indirection */
++ p1 = *(struct kinfo_proc **) pp1;
++ p2 = *(struct kinfo_proc **) 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(pp1, pp2)
++
++struct proc **pp1;
++struct proc **pp2;
++
++{
++ register struct kinfo_proc *p1;
++ register struct kinfo_proc *p2;
++ register int result;
++ register pctcpu lresult;
++
++ /* remove one level of indirection */
++ p1 = *(struct kinfo_proc **) pp1;
++ p2 = *(struct kinfo_proc **) pp2;
++
++ ORDERKEY_CPTICKS
++ ORDERKEY_PCTCPU
++ ORDERKEY_STATE
++ ORDERKEY_PRIO
++ ORDERKEY_RSSIZE
++ ORDERKEY_MEM
++ ;
++
++ return(result);
++ }
++
++/* compare_prio - the comparison function for sorting by cpu percentage */
++
++int
++compare_prio(pp1, pp2)
++
++struct proc **pp1;
++struct proc **pp2;
++
++{
++ register struct kinfo_proc *p1;
++ register struct kinfo_proc *p2;
++ register int result;
++ register pctcpu lresult;
++
++ /* remove one level of indirection */
++ p1 = *(struct kinfo_proc **) pp1;
++ p2 = *(struct kinfo_proc **) pp2;
++
++ ORDERKEY_PRIO
++ ORDERKEY_CPTICKS
++ ORDERKEY_PCTCPU
++ ORDERKEY_STATE
++ ORDERKEY_RSSIZE
++ ORDERKEY_MEM
++ ;
++
++ return(result);
++}
++#endif
++
++/*
++ * proc_owner(pid) - returns the uid that owns process "pid", or -1 if
++ * the process does not exist.
++ * It is EXTREMLY IMPORTANT that this function work correctly.
++ * If top runs setuid root (as in SVR4), then this function
++ * is the only thing that stands in the way of a serious
++ * security problem. It validates requests for the "kill"
++ * and "renice" commands.
++ */
++
++int proc_owner(pid)
++
++int pid;
++
++{
++ register int cnt;
++ register struct kinfo_proc **prefp;
++ register struct kinfo_proc *pp;
++
++ prefp = pref;
++ cnt = pref_len;
++ while (--cnt >= 0)
++ {
++ pp = *prefp++;
++ if (PP(pp, p_pid) == (pid_t)pid)
++ {
++ return((int)EP(pp, e_pcred.p_ruid));
++ }
++ }
++ return(-1);
++}
++
++
++/*
++ * swapmode is based on a program called swapinfo written
++ * by Kevin Lahey <[EMAIL PROTECTED]>.
++ */
++
++#define SVAR(var) __STRING(var) /* to force expansion */
++#define KGET(idx, var) \
++ KGET1(idx, &var, sizeof(var), SVAR(var))
++#define KGET1(idx, p, s, msg) \
++ KGET2(nlst[idx].n_value, p, s, msg)
++#define KGET2(addr, p, s, msg) \
++ if (kvm_read(kd, (u_long)(addr), p, s) != s) { \
++ warnx("cannot read %s: %s", msg, kvm_geterr(kd)); \
++ return (0); \
++ }
++#define KGETRET(addr, p, s, msg) \
++ if (kvm_read(kd, (u_long)(addr), p, s) != s) { \
++ warnx("cannot read %s: %s", msg, kvm_geterr(kd)); \
++ return (0); \
++ }
++
++
++int
++swapmode(retavail, retfree)
++ int *retavail;
++ int *retfree;
++{
++ int n;
++ int pagesize = getpagesize();
++ struct kvm_swap swapary[1];
++
++ *retavail = 0;
++ *retfree = 0;
++
++#define CONVERT(v) ((quad_t)(v) * pagesize / 1024)
++
++ n = kvm_getswapinfo(kd, swapary, 1, 0);
++ if (n < 0 || swapary[0].ksw_total == 0)
++ return(0);
++
++ *retavail = CONVERT(swapary[0].ksw_total);
++ *retfree = CONVERT(swapary[0].ksw_total - swapary[0].ksw_used);
++
++ n = (int)((double)swapary[0].ksw_used * 100.0 /
++ (double)swapary[0].ksw_total);
++ return(n);
++}
++
+Index: machine/m_linux.c
+--- machine/m_linux.c.orig 1999-01-15 15:42:07.000000000 +0100
++++ machine/m_linux.c 2003-10-05 16:58:31.000000000 +0200
+@@ -36,7 +36,11 @@
+
+ #include <sys/param.h> /* for HZ */
+ #include <asm/page.h> /* for PAGE_SHIFT */
++#if HAVE_LINUX_TASKS_H
+ #include <linux/tasks.h> /* for NR_TASKS */
++#else
++#define NR_TASKS 512
++#endif
+
+ #if 0
+ #include <linux/proc_fs.h> /* for PROC_SUPER_MAGIC */
+Index: utils.c
+--- utils.c.orig 2003-06-18 16:43:07.000000000 +0200
++++ utils.c 2003-10-05 16:52:21.000000000 +0200
+@@ -336,8 +336,10 @@
+ extern char *sys_errlist[];
+ #endif
+
++#if !defined(__FreeBSD__)
+ extern int sys_nerr;
+ #endif
++#endif
+
+ char *errmsg(errnum)
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/top/top.spec
============================================================================
$ cvs diff -u -r0 -r1.1 top.spec
--- /dev/null 2003-10-05 17:18:05.000000000 +0200
+++ top.spec 2003-10-05 17:18:05.000000000 +0200
@@ -0,0 +1,123 @@
+##
+## top.spec -- OpenPKG RPM Specification
+## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
+## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+## Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
+##
+
+# package version
+%define V_dist 3.5beta12.7
+%define V_opkg 3.5b12.7
+
+# package information
+Name: top
+Summary: Full-Screen Process Display
+URL: http://www.spang.uk.eu.org/top/
+Vendor: William LeFebvre
+Packager: The OpenPKG Project
+Distribution: OpenPKG [EVAL]
+Group: System
+License: Freely Redistributable
+Version: %{V_opkg}
+Release: 20031005
+
+# list of sources
+Source0: http://www.spang.uk.eu.org/top/top-%{V_dist}.tar.gz
+Patch0: top.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20030103
+PreReq: OpenPKG, openpkg >= 20030103
+AutoReq: no
+AutoReqProv: no
+
+%description
+ Top is a full-screen display of the currently running system
+ processes.
+
+%prep
+ %setup -q -n top-%{V_dist}
+ %patch -p0
+
+%build
+ # configure program
+ case "%{l_platform -t}" in
+ *-freebsd[45]* ) module="freebsd4" ;;
+ *-linux2* ) module="linux" ;;
+ *-sunos5* ) module="sunos57" ;;
+ * ) echo "platform \"%{l_platform -t}\" not supported" 1>&2; exit 1 ;;
+ esac
+ cdefs="%{l_cflags -O}"
+ if [ ".$module" = .linux ]; then
+ if [ -f /usr/include/linux/tasks.h ]; then
+ cdefs="$cdefs -DHAVE_LINUX_TASKS_H"
+ fi
+ fi
+ ( echo "set module = '$module'"
+ echo "set LoadMax = '4.0'"
+ echo "set topn = '-1'"
+ echo "set NominalTopn = '100'"
+ echo "set delay = '4'"
+ echo "set owner = '-'"
+ echo "set group = '-'"
+ echo "set mode = '-'"
+ echo "set random = '1'"
+ echo "set TableSize = '53'"
+ echo "set bindir = '%{l_prefix}/bin'"
+ echo "set mandir = '%{l_prefix}/man/man1'"
+ echo "set manext = '1'"
+ echo "set mansty = 'man'"
+ echo "set Cmdshell = '/bin/sh'"
+ echo "set Cmdcc = '%{l_cc}'"
+ echo "set Cmdawk = 'awk'"
+ echo "set Cmdinstall = './install'"
+ echo "set cdefs = '$cdefs'"
+ echo "set ColourDef = 'yes'"
+ ) >.defaults
+ ./Configure </dev/null
+
+ # build program
+ %{l_make} %{l_mflags}
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+
+ # install program
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/bin \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1
+ %{l_shtool} install -c -s -m 755 \
+ top $RPM_BUILD_ROOT%{l_prefix}/bin/
+ %{l_shtool} install -c -m 644 \
+ top.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/top'
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6860 -r1.6861 news.txt
--- openpkg-web/news.txt 5 Oct 2003 11:20:57 -0000 1.6860
+++ openpkg-web/news.txt 5 Oct 2003 15:18:03 -0000 1.6861
@@ -1,3 +1,4 @@
+05-Oct-2003: New package: P<top-3.5b12.7-20031005>
05-Oct-2003: Upgraded package: P<rfc-3.2.3-20031005>
05-Oct-2003: Upgraded package: P<mplayer-1.0pre1-20031005>
05-Oct-2003: Upgraded package: P<ncurses-5.3.20031004-20031005>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
