summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorjake <jake@FreeBSD.org>2001-02-12 00:21:38 +0000
committerjake <jake@FreeBSD.org>2001-02-12 00:21:38 +0000
commit0dc4d20fbded3f51c474394a4195ac5168728329 (patch)
treef399d384bf63952565cc2754fb8683f661b500ad /usr.bin
parent55d5108ac58bdc48fbd9eccefcb58a49682107b5 (diff)
downloadFreeBSD-src-0dc4d20fbded3f51c474394a4195ac5168728329.zip
FreeBSD-src-0dc4d20fbded3f51c474394a4195ac5168728329.tar.gz
Catch up to new priority interface.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/top/machine.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 1671dcc..a2d42bd 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -612,18 +612,18 @@ char *(*get_userid)();
pp->ki_pid,
namelength, namelength,
(*get_userid)(pp->ki_ruid),
- pp->ki_priority - PZERO,
+ pp->ki_pri.pri_level - PZERO,
/*
* normal time -> nice value -20 - +20
* real time 0 - 31 -> nice value -52 - -21
* idle time 0 - 31 -> nice value +21 - +52
*/
- (pp->ki_rtprio.type == RTP_PRIO_NORMAL ?
+ (pp->ki_pri.pri_class == PRI_TIMESHARE ?
pp->ki_nice - NZERO :
- (RTP_PRIO_IS_REALTIME(pp->ki_rtprio.type) ?
- (PRIO_MIN - 1 - RTP_PRIO_MAX + pp->ki_rtprio.prio) :
- (PRIO_MAX + 1 + pp->ki_rtprio.prio))),
+ (PRI_IS_REALTIME(pp->ki_pri.pri_class) ?
+ (PRIO_MIN - 1 - (PRI_MAX_REALTIME - pp->ki_pri.pri_level)) :
+ (PRIO_MAX + 1 + pp->ki_pri.pri_level - PRI_MIN_IDLE))),
format_k2(PROCSIZE(pp)),
format_k2(pagetok(pp->ki_rssize)),
status,
@@ -749,7 +749,7 @@ static unsigned char sorted_state[] =
sorted_state[(unsigned char) p1->ki_stat]) == 0)
#define ORDERKEY_PRIO \
- if ((result = p2->ki_priority - p1->ki_priority) == 0)
+ if ((result = p2->ki_pri.pri_level - p1->ki_pri.pri_level) == 0)
#define ORDERKEY_RSSIZE \
if ((result = p2->ki_rssize - p1->ki_rssize) == 0)
OpenPOWER on IntegriCloud