kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make CPU% display the same as ps and top do.

Browse source 
MEM% displays 0.0. Fix that.

PR:		207120
This commit is contained in:
Cy Schubert 2016-02-14 03:07:00 +00:00
parent d5cb36ef78
commit ece5a55f16
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=408842
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/htop/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= htop
PORTVERSION= 2.0.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= gaod@hychen.org

35
sysutils/htop/files/patch-freebsd__FreeBSDProcessList.c
View file

@ -1,6 +1,24 @@
--- freebsd/FreeBSDProcessList.c.orig 2016-02-13 00:37:56.160832000 +0800
+++ freebsd/FreeBSDProcessList.c 2016-02-13 00:38:19.671290000 +0800
@@ -477,8 +477,8 @@
--- freebsd/FreeBSDProcessList.c.orig 2016-02-10 12:48:39.000000000 -0800
+++ freebsd/FreeBSDProcessList.c 2016-02-13 13:42:40.759431578 -0800
@@ -84,6 +84,8 @@
static int MIB_kern_cp_times[2];
static int kernelFScale;
+// XXX hack
+static unsigned long long int Global_totalMem;
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
FreeBSDProcessList* fpl = xCalloc(1, sizeof(FreeBSDProcessList));
@@ -301,6 +303,8 @@
//pl->totalMem *= pageSizeKb;
sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0);
pl->totalMem /= 1024;
+ // XXX hack
+ Global_totalMem = pl->totalMem;
sysctl(MIB_vm_stats_vm_v_active_count, 4, &(fpl->memActive), &len, NULL, 0);
fpl->memActive *= pageSizeKb;
@@ -477,8 +481,9 @@
}
// from FreeBSD source /src/usr.bin/top/machine.c
@ -8,6 +26,17 @@
- proc->m_resident = kproc->ki_rssize * pageSizeKb;
+ proc->m_size = kproc->ki_size / 1024 / pageSizeKb;
+ proc->m_resident = kproc->ki_rssize;
+ proc->percent_mem = (proc->m_resident * PAGE_SIZE_KB) / (double)(Global_totalMem) * 100.0;
proc->nlwp = kproc->ki_numthreads;
proc->time = (kproc->ki_runtime + 5000) / 10000;
@@ -487,9 +492,6 @@
// system idle process should own all CPU time left regardless of CPU count
if ( strcmp("idle", kproc->ki_comm) == 0 ) {
isIdleProcess = true;
- } else {
- if (cpus > 1)
- proc->percent_cpu = proc->percent_cpu / (double) cpus;
}
}
if (isIdleProcess == false && proc->percent_cpu >= 99.8) {