zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hishamhm/htop

This commit is contained in:
Hisham 2016-02-12 23:34:28 -02:00
parent 0e3cf6975f a618f477b2
commit 3b9a4b1024
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freebsd/FreeBSDProcess.c
View File

@ -115,7 +115,7 @@ void FreeBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel
char buffer[256]; buffer[255] = '\0'; char buffer[256]; buffer[255] = '\0';
int attr = CRT_colors[DEFAULT_COLOR]; int attr = CRT_colors[DEFAULT_COLOR];
int n = sizeof(buffer) - 1; int n = sizeof(buffer) - 1;
switch (field) { switch ((int) field) {
// add FreeBSD-specific fields here // add FreeBSD-specific fields here
case JID: snprintf(buffer, n, Process_pidFormat, fp->jid); break; case JID: snprintf(buffer, n, Process_pidFormat, fp->jid); break;
case JAIL:{ case JAIL:{
@ -143,7 +143,7 @@ long FreeBSDProcess_compare(const void* v1, const void* v2) {
p2 = (FreeBSDProcess*)v1; p2 = (FreeBSDProcess*)v1;
p1 = (FreeBSDProcess*)v2; p1 = (FreeBSDProcess*)v2;
} }
switch (settings->sortKey) { switch ((int) settings->sortKey) {
// add FreeBSD-specific fields here // add FreeBSD-specific fields here
case JID: case JID:
return (p1->jid - p2->jid); return (p1->jid - p2->jid);

4
freebsd/FreeBSDProcessList.c
View File

@ -477,8 +477,8 @@ void ProcessList_goThroughEntries(ProcessList* this) {
} }
// from FreeBSD source /src/usr.bin/top/machine.c // from FreeBSD source /src/usr.bin/top/machine.c
proc->m_size = kproc->ki_size / 1024; proc->m_size = kproc->ki_size / 1024 / pageSizeKb;
proc->m_resident = kproc->ki_rssize * pageSizeKb; proc->m_resident = kproc->ki_rssize;
proc->nlwp = kproc->ki_numthreads; proc->nlwp = kproc->ki_numthreads;
proc->time = (kproc->ki_runtime + 5000) / 10000; proc->time = (kproc->ki_runtime + 5000) / 10000;

1
freebsd/Platform.c
View File

@ -24,6 +24,7 @@ in the source distribution for its full text.
#include <sys/resource.h> #include <sys/resource.h>
#include <vm/vm_param.h> #include <vm/vm_param.h>
#include <time.h> #include <time.h>
#include <math.h>
/*{ /*{
#include "Action.h" #include "Action.h"