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

Add support for cachedMem and fix usedMem on OpenBSD.

This commit is contained in:
Juan Francisco Cantero Hurtado 2016-02-12 01:28:22 +01:00
parent 1bedac1ca2
commit 1b5025e6f5
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openbsd/OpenBSDProcessList.c
View File

@ -10,18 +10,19 @@ in the source distribution for its full text.
#include "OpenBSDProcessList.h" #include "OpenBSDProcessList.h"
#include "OpenBSDProcess.h" #include "OpenBSDProcess.h"
#include <unistd.h>
#include <stdlib.h>
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <fcntl.h>
#include <sys/mount.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/user.h>
#include <fcntl.h>
#include <string.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/sysctl.h>
#include <sys/types.h>
#include <sys/user.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
/*{ /*{
@ -95,16 +96,28 @@ void ProcessList_delete(ProcessList* this) {
static inline void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) { static inline void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) {
static int uvmexp_mib[] = {CTL_VM, VM_UVMEXP}; static int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
struct uvmexp uvmexp; struct uvmexp uvmexp;
size_t size = sizeof(uvmexp); size_t size_uvmexp = sizeof(uvmexp);
if (sysctl(uvmexp_mib, 2, &uvmexp, &size, NULL, 0) < 0) { if (sysctl(uvmexp_mib, 2, &uvmexp, &size_uvmexp, NULL, 0) < 0) {
err(1, "uvmexp sysctl call failed"); err(1, "uvmexp sysctl call failed");
} }
//kb_pagesize = uvmexp.pagesize / 1024; //kb_pagesize = uvmexp.pagesize / 1024;
pl->usedMem = uvmexp.active * pageSizeKb;
pl->totalMem = uvmexp.npages * pageSizeKb; pl->totalMem = uvmexp.npages * pageSizeKb;
// Taken from OpenBSD systat/iostat.c, top/machine.c and uvm_sysctl(9)
static int bcache_mib[] = {CTL_VFS, VFS_GENERIC, VFS_BCACHESTAT};
struct bcachestats bcstats;
size_t size_bcstats = sizeof(bcstats);
if (sysctl(bcache_mib, 3, &bcstats, &size_bcstats, NULL, 0) < 0) {
err(1, "cannot get vfs.bcachestat");
}
pl->cachedMem = bcstats.numbufpages * pageSizeKb;
pl->freeMem = uvmexp.free * pageSizeKb;
pl->usedMem = (uvmexp.npages - uvmexp.free - uvmexp.paging) * pageSizeKb;
/* /*
const OpenBSDProcessList* opl = (OpenBSDProcessList*) pl; const OpenBSDProcessList* opl = (OpenBSDProcessList*) pl;