diff options
| author | Hisham <hisham@gobolinux.org> | 2016-02-12 23:34:28 -0200 |
|---|---|---|
| committer | Hisham <hisham@gobolinux.org> | 2016-02-12 23:34:28 -0200 |
| commit | 3b9a4b10247697661de1cc8ec1599eea4c95648b (patch) | |
| tree | 9c387feb0d2818257b07aaec1aaf77da862fb7fc | |
| parent | 0e3cf6975f96291fa203332aad9e44086ff8f2f2 (diff) | |
| parent | a618f477b229b9bc21e25472a61c31a2e3463553 (diff) | |
Merge branch 'master' of https://github.com/hishamhm/htop
| -rw-r--r-- | freebsd/FreeBSDProcess.c | 4 | ||||
| -rw-r--r-- | freebsd/FreeBSDProcessList.c | 4 | ||||
| -rw-r--r-- | freebsd/Platform.c | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c index 70cfb954..b0d2c37c 100644 --- a/freebsd/FreeBSDProcess.c +++ b/freebsd/FreeBSDProcess.c @@ -115,7 +115,7 @@ void FreeBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel char buffer[256]; buffer[255] = '\0'; int attr = CRT_colors[DEFAULT_COLOR]; int n = sizeof(buffer) - 1; - switch (field) { + switch ((int) field) { // add FreeBSD-specific fields here case JID: snprintf(buffer, n, Process_pidFormat, fp->jid); break; case JAIL:{ @@ -143,7 +143,7 @@ long FreeBSDProcess_compare(const void* v1, const void* v2) { p2 = (FreeBSDProcess*)v1; p1 = (FreeBSDProcess*)v2; } - switch (settings->sortKey) { + switch ((int) settings->sortKey) { // add FreeBSD-specific fields here case JID: return (p1->jid - p2->jid); diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index 7c4a6db5..b9359e54 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -477,8 +477,8 @@ void ProcessList_goThroughEntries(ProcessList* this) { } // from FreeBSD source /src/usr.bin/top/machine.c - proc->m_size = kproc->ki_size / 1024; - proc->m_resident = kproc->ki_rssize * pageSizeKb; + proc->m_size = kproc->ki_size / 1024 / pageSizeKb; + proc->m_resident = kproc->ki_rssize; proc->nlwp = kproc->ki_numthreads; proc->time = (kproc->ki_runtime + 5000) / 10000; diff --git a/freebsd/Platform.c b/freebsd/Platform.c index 9e0c25b0..f02daa5a 100644 --- a/freebsd/Platform.c +++ b/freebsd/Platform.c @@ -24,6 +24,7 @@ in the source distribution for its full text. #include <sys/resource.h> #include <vm/vm_param.h> #include <time.h> +#include <math.h> /*{ #include "Action.h" |