mirror of https://github.com/xzeldon/htop.git
Merge pull request #436 from mmcco/tuneup
Misc. OpenBSD tuneup and improvement
This commit is contained in:
commit
694addceb5
|
@ -12,14 +12,15 @@ in the source distribution for its full text.
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <err.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/proc.h>
|
#include <sys/proc.h>
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
#include <sys/user.h>
|
#include <sys/user.h>
|
||||||
|
#include <err.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <limits.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
|
|
||||||
|
@ -42,22 +43,37 @@ typedef struct OpenBSDProcessList_ {
|
||||||
|
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
#ifndef CLAMP
|
/*
|
||||||
#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
|
* avoid relying on or conflicting with MIN() and MAX() in sys/param.h
|
||||||
|
*/
|
||||||
|
#ifndef MINIMUM
|
||||||
|
#define MINIMUM(x, y) ((x) > (y) ? (y) : (x))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAXIMUM
|
||||||
|
#define MAXIMUM(x, y) ((x) > (y) ? (x) : (y))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CLAMP
|
||||||
|
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : MAXIMUM(x, low))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int pageSizeKb;
|
|
||||||
static long fscale;
|
static long fscale;
|
||||||
|
|
||||||
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
|
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
|
||||||
int mib[] = { CTL_HW, HW_NCPU };
|
int mib[] = { CTL_HW, HW_NCPU };
|
||||||
int fmib[] = { CTL_KERN, KERN_FSCALE };
|
int fmib[] = { CTL_KERN, KERN_FSCALE };
|
||||||
int i, e;
|
int i, e;
|
||||||
OpenBSDProcessList* opl = xCalloc(1, sizeof(OpenBSDProcessList));
|
OpenBSDProcessList* opl;
|
||||||
ProcessList* pl = (ProcessList*) opl;
|
ProcessList* pl;
|
||||||
size_t size = sizeof(pl->cpuCount);
|
size_t size;
|
||||||
|
char errbuf[_POSIX2_LINE_MAX];
|
||||||
|
|
||||||
|
opl = xCalloc(1, sizeof(OpenBSDProcessList));
|
||||||
|
pl = (ProcessList*) opl;
|
||||||
|
size = sizeof(pl->cpuCount);
|
||||||
ProcessList_init(pl, Class(OpenBSDProcess), usersTable, pidWhiteList, userId);
|
ProcessList_init(pl, Class(OpenBSDProcess), usersTable, pidWhiteList, userId);
|
||||||
|
|
||||||
e = sysctl(mib, 2, &pl->cpuCount, &size, NULL, 0);
|
e = sysctl(mib, 2, &pl->cpuCount, &size, NULL, 0);
|
||||||
if (e == -1 || pl->cpuCount < 1) {
|
if (e == -1 || pl->cpuCount < 1) {
|
||||||
pl->cpuCount = 1;
|
pl->cpuCount = 1;
|
||||||
|
@ -65,26 +81,29 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
|
||||||
opl->cpus = xRealloc(opl->cpus, pl->cpuCount * sizeof(CPUData));
|
opl->cpus = xRealloc(opl->cpus, pl->cpuCount * sizeof(CPUData));
|
||||||
|
|
||||||
size = sizeof(fscale);
|
size = sizeof(fscale);
|
||||||
if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0)
|
if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0) {
|
||||||
err(1, "fscale sysctl call failed");
|
err(1, "fscale sysctl call failed");
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < pl->cpuCount; i++) {
|
for (i = 0; i < pl->cpuCount; i++) {
|
||||||
opl->cpus[i].totalTime = 1;
|
opl->cpus[i].totalTime = 1;
|
||||||
opl->cpus[i].totalPeriod = 1;
|
opl->cpus[i].totalPeriod = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
pageSizeKb = PAGE_SIZE_KB;
|
opl->kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
|
||||||
|
if (opl->kd == NULL) {
|
||||||
// XXX: last arg should eventually be an errbuf
|
errx(1, "kvm_open: %s", errbuf);
|
||||||
opl->kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
|
}
|
||||||
assert(opl->kd);
|
|
||||||
|
|
||||||
return pl;
|
return pl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProcessList_delete(ProcessList* this) {
|
void ProcessList_delete(ProcessList* this) {
|
||||||
const OpenBSDProcessList* opl = (OpenBSDProcessList*) this;
|
const OpenBSDProcessList* opl = (OpenBSDProcessList*) this;
|
||||||
if (opl->kd) kvm_close(opl->kd);
|
|
||||||
|
if (opl->kd) {
|
||||||
|
kvm_close(opl->kd);
|
||||||
|
}
|
||||||
|
|
||||||
free(opl->cpus);
|
free(opl->cpus);
|
||||||
|
|
||||||
|
@ -101,9 +120,8 @@ static inline void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) {
|
||||||
err(1, "uvmexp sysctl call failed");
|
err(1, "uvmexp sysctl call failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
//kb_pagesize = uvmexp.pagesize / 1024;
|
pl->usedMem = uvmexp.active * PAGE_SIZE_KB;
|
||||||
pl->usedMem = uvmexp.active * pageSizeKb;
|
pl->totalMem = uvmexp.npages * PAGE_SIZE_KB;
|
||||||
pl->totalMem = uvmexp.npages * pageSizeKb;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
const OpenBSDProcessList* opl = (OpenBSDProcessList*) pl;
|
const OpenBSDProcessList* opl = (OpenBSDProcessList*) pl;
|
||||||
|
@ -112,10 +130,10 @@ static inline void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) {
|
||||||
sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0);
|
sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0);
|
||||||
pl->totalMem /= 1024;
|
pl->totalMem /= 1024;
|
||||||
sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(pl->usedMem), &len, NULL, 0);
|
sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(pl->usedMem), &len, NULL, 0);
|
||||||
pl->usedMem *= pageSizeKb;
|
pl->usedMem *= PAGE_SIZE_KB;
|
||||||
pl->freeMem = pl->totalMem - pl->usedMem;
|
pl->freeMem = pl->totalMem - pl->usedMem;
|
||||||
sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0);
|
sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0);
|
||||||
pl->cachedMem *= pageSizeKb;
|
pl->cachedMem *= PAGE_SIZE_KB;
|
||||||
|
|
||||||
struct kvm_swap swap[16];
|
struct kvm_swap swap[16];
|
||||||
int nswap = kvm_getswapinfo(opl->kd, swap, sizeof(swap)/sizeof(swap[0]), 0);
|
int nswap = kvm_getswapinfo(opl->kd, swap, sizeof(swap)/sizeof(swap[0]), 0);
|
||||||
|
@ -125,8 +143,8 @@ static inline void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) {
|
||||||
pl->totalSwap += swap[i].ksw_total;
|
pl->totalSwap += swap[i].ksw_total;
|
||||||
pl->usedSwap += swap[i].ksw_used;
|
pl->usedSwap += swap[i].ksw_used;
|
||||||
}
|
}
|
||||||
pl->totalSwap *= pageSizeKb;
|
pl->totalSwap *= PAGE_SIZE_KB;
|
||||||
pl->usedSwap *= pageSizeKb;
|
pl->usedSwap *= PAGE_SIZE_KB;
|
||||||
|
|
||||||
pl->sharedMem = 0; // currently unused
|
pl->sharedMem = 0; // currently unused
|
||||||
pl->buffersMem = 0; // not exposed to userspace
|
pl->buffersMem = 0; // not exposed to userspace
|
||||||
|
@ -134,40 +152,40 @@ static inline void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) {
|
||||||
}
|
}
|
||||||
|
|
||||||
char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd) {
|
char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd) {
|
||||||
char *s, *buf, **arg;
|
char *s, **arg;
|
||||||
size_t cpsz, len = 0, n;
|
size_t len = 0, n;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We attempt to fall back to just the command name (argv[0]) if we
|
* Like OpenBSD's top(1), we try to fall back to the command name
|
||||||
* fail to construct the full command at any point.
|
* (argv[0]) if we fail to construct the full command.
|
||||||
*/
|
*/
|
||||||
arg = kvm_getargv(kd, kproc, 500);
|
arg = kvm_getargv(kd, kproc, 500);
|
||||||
if (arg == NULL) {
|
if (arg == NULL || *arg == NULL) {
|
||||||
if ((s = xStrdup(kproc->p_comm)) == NULL) {
|
*basenameEnd = strlen(kproc->p_comm);
|
||||||
err(1, NULL);
|
return xStrdup(kproc->p_comm);
|
||||||
}
|
|
||||||
return s;
|
|
||||||
}
|
}
|
||||||
for (i = 0; arg[i] != NULL; i++) {
|
for (i = 0; arg[i] != NULL; i++) {
|
||||||
len += strlen(arg[i]) + 1;
|
len += strlen(arg[i]) + 1; /* room for arg and trailing space or NUL */
|
||||||
}
|
}
|
||||||
if ((buf = s = xMalloc(len)) == NULL) {
|
/* don't use xMalloc here - we want to handle huge argv's gracefully */
|
||||||
if ((s = xStrdup(kproc->p_comm)) == NULL) {
|
if ((s = malloc(len)) == NULL) {
|
||||||
err(1, NULL);
|
*basenameEnd = strlen(kproc->p_comm);
|
||||||
}
|
return xStrdup(kproc->p_comm);
|
||||||
return s;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
*s = '\0';
|
||||||
|
|
||||||
for (i = 0; arg[i] != NULL; i++) {
|
for (i = 0; arg[i] != NULL; i++) {
|
||||||
n = strlcpy(buf, arg[i], (s + len) - buf);
|
n = strlcat(s, arg[i], len);
|
||||||
buf += n;
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
*basenameEnd = n;
|
/* TODO: rename all basenameEnd to basenameLen, make size_t */
|
||||||
|
*basenameEnd = MINIMUM(n, len-1);
|
||||||
}
|
}
|
||||||
*buf = ' ';
|
/* the trailing space should get truncated anyway */
|
||||||
buf++;
|
strlcat(s, " ", len);
|
||||||
}
|
}
|
||||||
*(buf - 1) = '\0';
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,20 @@ typedef struct OpenBSDProcessList_ {
|
||||||
} OpenBSDProcessList;
|
} OpenBSDProcessList;
|
||||||
|
|
||||||
|
|
||||||
#ifndef CLAMP
|
/*
|
||||||
#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
|
* avoid relying on or conflicting with MIN() and MAX() in sys/param.h
|
||||||
|
*/
|
||||||
|
#ifndef MINIMUM
|
||||||
|
#define MINIMUM(x, y) ((x) > (y) ? (y) : (x))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAXIMUM
|
||||||
|
#define MAXIMUM(x, y) ((x) > (y) ? (x) : (y))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CLAMP
|
||||||
|
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : MAXIMUM(x, low))
|
||||||
|
#endif
|
||||||
|
|
||||||
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
|
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue