mirror of https://github.com/xzeldon/htop.git
Merge branch 'openbsd' of cgzones/htop
This commit is contained in:
commit
6ea93fc6c0
|
@ -311,6 +311,11 @@ static void ProcessList_updateTreeSet(ProcessList* this) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ProcessList_buildTreeBranch(ProcessList* this, pid_t pid, int level, int indent, int direction, bool show, int* node_counter, int* node_index) {
|
static void ProcessList_buildTreeBranch(ProcessList* this, pid_t pid, int level, int indent, int direction, bool show, int* node_counter, int* node_index) {
|
||||||
|
// On OpenBSD the kernel thread 'swapper' has pid 0.
|
||||||
|
// Do not treat it as root of any tree.
|
||||||
|
if (pid == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
Vector* children = Vector_new(Class(Process), false, DEFAULT_SIZE);
|
Vector* children = Vector_new(Class(Process), false, DEFAULT_SIZE);
|
||||||
|
|
||||||
for (int i = Vector_size(this->processes) - 1; i >= 0; i--) {
|
for (int i = Vector_size(this->processes) - 1; i >= 0; i--) {
|
||||||
|
|
|
@ -115,4 +115,8 @@ Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting,
|
||||||
|
|
||||||
void ProcessList_scan(ProcessList* this, bool pauseProcessUpdate);
|
void ProcessList_scan(ProcessList* this, bool pauseProcessUpdate);
|
||||||
|
|
||||||
|
static inline Process* ProcessList_findProcess(ProcessList* this, pid_t pid) {
|
||||||
|
return (Process*) Hashtable_get(this->processTable, pid);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -17,11 +17,18 @@ in the source distribution for its full text.
|
||||||
|
|
||||||
typedef struct OpenBSDProcess_ {
|
typedef struct OpenBSDProcess_ {
|
||||||
Process super;
|
Process super;
|
||||||
|
|
||||||
|
/* 'Kernel virtual addr of u-area' to detect main threads */
|
||||||
|
uint64_t addr;
|
||||||
} OpenBSDProcess;
|
} OpenBSDProcess;
|
||||||
|
|
||||||
#define Process_isKernelThread(_process) (_process->pgrp == 0)
|
static inline bool Process_isKernelThread(const Process* this) {
|
||||||
|
return this->pgrp == 0;
|
||||||
|
}
|
||||||
|
|
||||||
#define Process_isUserlandThread(_process) (_process->pid != _process->tgid)
|
static inline bool Process_isUserlandThread(const Process* this) {
|
||||||
|
return this->pid != this->tgid;
|
||||||
|
}
|
||||||
|
|
||||||
extern const ProcessClass OpenBSDProcess_class;
|
extern const ProcessClass OpenBSDProcess_class;
|
||||||
|
|
||||||
|
|
|
@ -74,6 +74,8 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
|
||||||
CRT_fatalError("kvm_openfiles() failed");
|
CRT_fatalError("kvm_openfiles() failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
opl->cpuSpeed = -1;
|
||||||
|
|
||||||
return pl;
|
return pl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -192,18 +194,29 @@ static double getpcpu(const struct kinfo_proc* kp) {
|
||||||
|
|
||||||
static void OpenBSDProcessList_scanProcs(OpenBSDProcessList* this) {
|
static void OpenBSDProcessList_scanProcs(OpenBSDProcessList* this) {
|
||||||
const Settings* settings = this->super.settings;
|
const Settings* settings = this->super.settings;
|
||||||
bool hideKernelThreads = settings->hideKernelThreads;
|
const bool hideKernelThreads = settings->hideKernelThreads;
|
||||||
bool hideUserlandThreads = settings->hideUserlandThreads;
|
const bool hideUserlandThreads = settings->hideUserlandThreads;
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
const struct kinfo_proc* kprocs = kvm_getprocs(this->kd, KERN_PROC_KTHREAD, 0, sizeof(struct kinfo_proc), &count);
|
const struct kinfo_proc* kprocs = kvm_getprocs(this->kd, KERN_PROC_KTHREAD | KERN_PROC_SHOW_THREADS, 0, sizeof(struct kinfo_proc), &count);
|
||||||
|
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
const struct kinfo_proc* kproc = &kprocs[i];
|
const struct kinfo_proc* kproc = &kprocs[i];
|
||||||
|
|
||||||
|
/* Ignore main threads */
|
||||||
|
if (kproc->p_tid != -1) {
|
||||||
|
Process* containingProcess = ProcessList_findProcess(&this->super, kproc->p_pid);
|
||||||
|
if (containingProcess) {
|
||||||
|
if (((OpenBSDProcess*)containingProcess)->addr == kproc->p_addr)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
containingProcess->nlwp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool preExisting = false;
|
bool preExisting = false;
|
||||||
Process* proc = ProcessList_getProcess(&this->super, kproc->p_pid, &preExisting, OpenBSDProcess_new);
|
Process* proc = ProcessList_getProcess(&this->super, (kproc->p_tid == -1) ? kproc->p_pid : kproc->p_tid, &preExisting, OpenBSDProcess_new);
|
||||||
//OpenBSDProcess* fp = (OpenBSDProcess*) proc;
|
OpenBSDProcess* fp = (OpenBSDProcess*) proc;
|
||||||
|
|
||||||
proc->show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));
|
proc->show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));
|
||||||
|
|
||||||
|
@ -227,33 +240,38 @@ static void OpenBSDProcessList_scanProcs(OpenBSDProcessList* this) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fp->addr = kproc->p_addr;
|
||||||
proc->m_virt = kproc->p_vm_dsize * pageSizeKB;
|
proc->m_virt = kproc->p_vm_dsize * pageSizeKB;
|
||||||
proc->m_resident = kproc->p_vm_rssize * pageSizeKB;
|
proc->m_resident = kproc->p_vm_rssize * pageSizeKB;
|
||||||
proc->percent_mem = proc->m_resident / (double)(this->super.totalMem) * 100.0;
|
proc->percent_mem = proc->m_resident / (float)this->super.totalMem * 100.0F;
|
||||||
proc->percent_cpu = CLAMP(getpcpu(kproc), 0.0, this->super.cpuCount * 100.0);
|
proc->percent_cpu = CLAMP(getpcpu(kproc), 0.0F, this->super.cpuCount * 100.0F);
|
||||||
//proc->nlwp = kproc->p_numthreads;
|
|
||||||
proc->nice = kproc->p_nice - 20;
|
proc->nice = kproc->p_nice - 20;
|
||||||
proc->time = 100 * (kproc->p_rtime_sec + ((kproc->p_rtime_usec + 500000) / 1000000));
|
proc->time = 100 * (kproc->p_rtime_sec + ((kproc->p_rtime_usec + 500000) / 1000000));
|
||||||
proc->priority = kproc->p_priority - PZERO;
|
proc->priority = kproc->p_priority - PZERO;
|
||||||
|
proc->processor = kproc->p_cpuid;
|
||||||
|
proc->minflt = kproc->p_uru_minflt;
|
||||||
|
proc->majflt = kproc->p_uru_majflt;
|
||||||
|
proc->nlwp = 1;
|
||||||
|
|
||||||
switch (kproc->p_stat) {
|
switch (kproc->p_stat) {
|
||||||
case SIDL: proc->state = 'I'; break;
|
case SIDL: proc->state = 'I'; break;
|
||||||
case SRUN: proc->state = 'R'; break;
|
case SRUN: proc->state = 'P'; break;
|
||||||
case SSLEEP: proc->state = 'S'; break;
|
case SSLEEP: proc->state = 'S'; break;
|
||||||
case SSTOP: proc->state = 'T'; break;
|
case SSTOP: proc->state = 'T'; break;
|
||||||
case SZOMB: proc->state = 'Z'; break;
|
case SZOMB: proc->state = 'Z'; break;
|
||||||
case SDEAD: proc->state = 'D'; break;
|
case SDEAD: proc->state = 'D'; break;
|
||||||
case SONPROC: proc->state = 'P'; break;
|
case SONPROC: proc->state = 'R'; break;
|
||||||
default: proc->state = '?';
|
default: proc->state = '?';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Process_isKernelThread(proc)) {
|
if (Process_isKernelThread(proc)) {
|
||||||
this->super.kernelThreads++;
|
this->super.kernelThreads++;
|
||||||
|
} else if (Process_isUserlandThread(proc)) {
|
||||||
|
this->super.userlandThreads++;
|
||||||
}
|
}
|
||||||
|
|
||||||
this->super.totalTasks++;
|
this->super.totalTasks++;
|
||||||
// SRUN ('R') means runnable, not running
|
if (proc->state == 'R') {
|
||||||
if (proc->state == 'P') {
|
|
||||||
this->super.runningTasks++;
|
this->super.runningTasks++;
|
||||||
}
|
}
|
||||||
proc->updated = true;
|
proc->updated = true;
|
||||||
|
@ -333,6 +351,17 @@ static void OpenBSDProcessList_scanCPUTime(OpenBSDProcessList* this) {
|
||||||
}
|
}
|
||||||
|
|
||||||
kernelCPUTimesToHtop(avg, this->cpus);
|
kernelCPUTimesToHtop(avg, this->cpus);
|
||||||
|
|
||||||
|
{
|
||||||
|
const int mib[] = { CTL_HW, HW_CPUSPEED };
|
||||||
|
int cpuSpeed;
|
||||||
|
size_t size = sizeof(cpuSpeed);
|
||||||
|
if (sysctl(mib, 2, &cpuSpeed, &size, NULL, 0) == -1) {
|
||||||
|
this->cpuSpeed = -1;
|
||||||
|
} else {
|
||||||
|
this->cpuSpeed = cpuSpeed;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
|
void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
|
||||||
|
|
|
@ -42,6 +42,7 @@ typedef struct OpenBSDProcessList_ {
|
||||||
kvm_t* kd;
|
kvm_t* kd;
|
||||||
|
|
||||||
CPUData* cpus;
|
CPUData* cpus;
|
||||||
|
int cpuSpeed;
|
||||||
|
|
||||||
} OpenBSDProcessList;
|
} OpenBSDProcessList;
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,8 @@ in the source distribution for its full text.
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <sys/signal.h> // needs to be included before <sys/proc.h> for 'struct sigaltstack'
|
||||||
|
#include <sys/proc.h>
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
#include <sys/sensors.h>
|
#include <sys/sensors.h>
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
|
@ -162,8 +164,7 @@ void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int Platform_getMaxPid() {
|
int Platform_getMaxPid() {
|
||||||
// this is hard-coded in sys/proc.h - no sysctl exists
|
return 2 * THREAD_PID_OFFSET;
|
||||||
return 99999;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
double Platform_setCPUValues(Meter* this, unsigned int cpu) {
|
double Platform_setCPUValues(Meter* this, unsigned int cpu) {
|
||||||
|
@ -196,6 +197,8 @@ double Platform_setCPUValues(Meter* this, unsigned int cpu) {
|
||||||
|
|
||||||
v[CPU_METER_TEMPERATURE] = NAN;
|
v[CPU_METER_TEMPERATURE] = NAN;
|
||||||
|
|
||||||
|
v[CPU_METER_FREQUENCY] = (pl->cpuSpeed != -1) ? pl->cpuSpeed : NAN;
|
||||||
|
|
||||||
return totalPercent;
|
return totalPercent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue