d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have the main() routine calculate %CPU and (if needed) memory information

Browse Source 
when copying per-process info before starting to sort the list.  This way,
sort-by-CPU or sort-by-memory will only calculate values once-per-process,
instead of twice-per-comparison.  Also take advantage of this to simplify
the pscomp() routine.
This commit is contained in:
Garance A Drosehn 2004-06-20 21:25:10 +00:00
parent 15a646e411
commit 4bac4483db
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
bin/ps/ps.c
View File

@ -166,6 +166,7 @@ main(int argc, char *argv[])
struct listinfo gidlist, pgrplist, pidlist;
struct listinfo ruidlist, sesslist, ttylist, uidlist;
struct kinfo_proc *kp;
KINFO *next_KINFO;
struct varent *vent;
struct winsize ws;
const char *nlistf, *memf;
@ -569,10 +570,15 @@ main(int argc, char *argv[])
continue;
keepit:
kinfo[nkept].ki_p = kp;
next_KINFO = &kinfo[nkept];
next_KINFO->ki_p = kp;
next_KINFO->ki_pcpu = getpcpu(next_KINFO);
if (sortby == SORTMEM)
next_KINFO->ki_memsize = kp->ki_tsize +
kp->ki_dsize + kp->ki_ssize;
if (needuser)
saveuser(&kinfo[nkept]);
dynsizevars(&kinfo[nkept]);
saveuser(next_KINFO);
dynsizevars(next_KINFO);
nkept++;
}
}
@ -989,53 +995,40 @@ saveuser(KINFO *ki)
}
}
/* A macro used to improve the readability of pscomp(). */
#define DIFF_RETURN(a, b, field) do { \
if ((a)->field != (b)->field) \
return (((a)->field < (b)->field) ? -1 : 1); \
} while (0)
static int
pscomp(const void *a, const void *b)
{
const KINFO *ka, *kb;
double cpua, cpub;
segsz_t sizea, sizeb;
ka = a;
kb = b;
/* SORTCPU and SORTMEM are sorted in descending order. */
if (sortby == SORTCPU) {
cpua = getpcpu(ka);
cpub = getpcpu(kb);
if (cpua < cpub)
return (1);
if (cpua > cpub)
return (-1);
}
if (sortby == SORTMEM) {
sizea = ka->ki_p->ki_tsize + ka->ki_p->ki_dsize +
ka->ki_p->ki_ssize;
sizeb = kb->ki_p->ki_tsize + kb->ki_p->ki_dsize +
kb->ki_p->ki_ssize;
if (sizea < sizeb)
return (1);
if (sizea > sizeb)
return (-1);
}
if (sortby == SORTCPU)
DIFF_RETURN(kb, ka, ki_pcpu);
if (sortby == SORTMEM)
DIFF_RETURN(kb, ka, ki_memsize);
/*
* TTY's are sorted in ascending order, except that all NODEV
* processes come before all processes with a device.
*/
if (ka->ki_p->ki_tdev == NODEV && kb->ki_p->ki_tdev != NODEV)
return (-1);
if (ka->ki_p->ki_tdev != NODEV && kb->ki_p->ki_tdev == NODEV)
return (1);
if (ka->ki_p->ki_tdev < kb->ki_p->ki_tdev)
return (-1);
if (ka->ki_p->ki_tdev > kb->ki_p->ki_tdev)
return (1);
/* PID's are sorted in ascending order. */
if (ka->ki_p->ki_pid < kb->ki_p->ki_pid)
return (-1);
if (ka->ki_p->ki_pid > kb->ki_p->ki_pid)
return (1);
if (ka->ki_p->ki_tdev != kb->ki_p->ki_tdev) {
if (ka->ki_p->ki_tdev == NODEV)
return (-1);
if (kb->ki_p->ki_tdev == NODEV)
return (1);
DIFF_RETURN(ka, kb, ki_p->ki_tdev);
}
DIFF_RETURN(ka, kb, ki_p->ki_pid);
return (0);
}
#undef DIFF_RETURN
/*
* ICK (all for getopt), would rather hide the ugliness

2
bin/ps/ps.h
View File

@ -38,6 +38,8 @@ typedef struct kinfo {
char *ki_args; /* exec args */
char *ki_env; /* environment */
int ki_valid; /* 1 => uarea stuff valid */
double ki_pcpu; /* calculated in main() */
segsz_t ki_memsize; /* calculated in main() */
} KINFO;
/* Variables. */