diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2016-03-07 16:54:38 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2016-03-07 16:54:38 -0300 |
| commit | 98e43816a5875c5d5772de044aed6aa51b9d4bc3 (patch) | |
| tree | b3cebadad307be344674fae1d3c8b6a911d75766 /freebsd/FreeBSDProcessList.c | |
| parent | 694addceb5a36952d131e948c7d0a56c89a63591 (diff) | |
| parent | f554f08fa92f8440faa853b5fa4d588829959c8a (diff) | |
Merge branch 'master' of https://github.com/Sp1l/htop into Sp1l-master
Diffstat (limited to 'freebsd/FreeBSDProcessList.c')
| -rw-r--r-- | freebsd/FreeBSDProcessList.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index 0cfe16c3..9d921d9e 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -86,6 +86,8 @@ static int MIB_kern_cp_time[2]; 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) { size_t len; @@ -305,6 +307,8 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) { //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; @@ -483,6 +487,7 @@ void ProcessList_goThroughEntries(ProcessList* this) { // from FreeBSD source /src/usr.bin/top/machine.c 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; @@ -493,9 +498,6 @@ void ProcessList_goThroughEntries(ProcessList* this) { // 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) { |