From 72235d8e098d9d79029dca65122605741e1aafad Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Tue, 2 May 2023 16:56:18 +1000 Subject: Adapt platform code for the new Machine base class Move host-centric data to new derived Machine classes, separate from process-list-centric data. --- freebsd/FreeBSDMachine.c | 396 +++++++++++++++++++++++++++++++++++++++++++ freebsd/FreeBSDMachine.h | 54 ++++++ freebsd/FreeBSDProcessList.c | 386 ++--------------------------------------- freebsd/FreeBSDProcessList.h | 41 ----- freebsd/Platform.c | 32 ++-- 5 files changed, 480 insertions(+), 429 deletions(-) create mode 100644 freebsd/FreeBSDMachine.c create mode 100644 freebsd/FreeBSDMachine.h (limited to 'freebsd') diff --git a/freebsd/FreeBSDMachine.c b/freebsd/FreeBSDMachine.c new file mode 100644 index 00000000..b8d5d87f --- /dev/null +++ b/freebsd/FreeBSDMachine.c @@ -0,0 +1,396 @@ +/* +htop - FreeBSDMachine.c +(C) 2014 Hisham H. Muhammad +Released under the GNU GPLv2+, see the COPYING file +in the source distribution for its full text. +*/ + +#include "config.h" // IWYU pragma: keep + +#include "freebsd/FreeBSDMachine.h" + +#include +#include +#include +#include +#include +#include +#include +#include // needs to be included before for MAXPATHLEN +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "CRT.h" +#include "Compat.h" +#include "Macros.h" +#include "Object.h" +#include "Scheduling.h" +#include "Settings.h" +#include "XUtils.h" +#include "generic/openzfs_sysctl.h" +#include "zfs/ZfsArcStats.h" + + +static int MIB_hw_physmem[2]; +static int MIB_vm_stats_vm_v_page_count[4]; + +static int MIB_vm_stats_vm_v_wire_count[4]; +static int MIB_vm_stats_vm_v_active_count[4]; +static int MIB_vm_stats_vm_v_cache_count[4]; +static int MIB_vm_stats_vm_v_inactive_count[4]; +static int MIB_vm_stats_vm_v_free_count[4]; +static int MIB_vm_vmtotal[2]; + +static int MIB_vfs_bufspace[2]; + +static int MIB_kern_cp_time[2]; +static int MIB_kern_cp_times[2]; + +Machine* Machine_new(UsersTable* usersTable, uid_t userId) { + FreeBSDMachine* this = xCalloc(1, sizeof(FreeBSDMachine)); + Machine* super = &this->super; + char errbuf[_POSIX2_LINE_MAX]; + size_t len; + + Machine_init(this, usersTable, userId); + + // physical memory in system: hw.physmem + // physical page size: hw.pagesize + // usable pagesize : vm.stats.vm.v_page_size + len = 2; sysctlnametomib("hw.physmem", MIB_hw_physmem, &len); + + len = sizeof(this->pageSize); + if (sysctlbyname("vm.stats.vm.v_page_size", &this->pageSize, &len, NULL, 0) == -1) + CRT_fatalError("Cannot get pagesize by sysctl"); + this->pageSizeKb = this->pageSize / ONE_K; + + // usable page count vm.stats.vm.v_page_count + // actually usable memory : vm.stats.vm.v_page_count * vm.stats.vm.v_page_size + len = 4; sysctlnametomib("vm.stats.vm.v_page_count", MIB_vm_stats_vm_v_page_count, &len); + + len = 4; sysctlnametomib("vm.stats.vm.v_wire_count", MIB_vm_stats_vm_v_wire_count, &len); + len = 4; sysctlnametomib("vm.stats.vm.v_active_count", MIB_vm_stats_vm_v_active_count, &len); + len = 4; sysctlnametomib("vm.stats.vm.v_cache_count", MIB_vm_stats_vm_v_cache_count, &len); + len = 4; sysctlnametomib("vm.stats.vm.v_inactive_count", MIB_vm_stats_vm_v_inactive_count, &len); + len = 4; sysctlnametomib("vm.stats.vm.v_free_count", MIB_vm_stats_vm_v_free_count, &len); + len = 2; sysctlnametomib("vm.vmtotal", MIB_vm_vmtotal, &len); + + len = 2; sysctlnametomib("vfs.bufspace", MIB_vfs_bufspace, &len); + + openzfs_sysctl_init(&this->zfs); + openzfs_sysctl_updateArcStats(&this->zfs); + + int smp = 0; + len = sizeof(smp); + + if (sysctlbyname("kern.smp.active", &smp, &len, NULL, 0) != 0 || len != sizeof(smp)) { + smp = 0; + } + + int cpus = 1; + len = sizeof(cpus); + + if (smp) { + int err = sysctlbyname("kern.smp.cpus", &cpus, &len, NULL, 0); + if (err) { + cpus = 1; + } + } else { + cpus = 1; + } + + size_t sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES; + len = 2; sysctlnametomib("kern.cp_time", MIB_kern_cp_time, &len); + this->cp_time_o = xCalloc(CPUSTATES, sizeof(unsigned long)); + this->cp_time_n = xCalloc(CPUSTATES, sizeof(unsigned long)); + len = sizeof_cp_time_array; + + // fetch initial single (or average) CPU clicks from kernel + sysctl(MIB_kern_cp_time, 2, this->cp_time_o, &len, NULL, 0); + + // on smp box, fetch rest of initial CPU's clicks + if (cpus > 1) { + len = 2; sysctlnametomib("kern.cp_times", MIB_kern_cp_times, &len); + this->cp_times_o = xCalloc(cpus, sizeof_cp_time_array); + this->cp_times_n = xCalloc(cpus, sizeof_cp_time_array); + len = cpus * sizeof_cp_time_array; + sysctl(MIB_kern_cp_times, 2, this->cp_times_o, &len, NULL, 0); + } + + super->existingCPUs = MAXIMUM(cpus, 1); + // TODO: support offline CPUs and hot swapping + super->activeCPUs = super->existingCPUs; + + if (cpus == 1 ) { + this->cpus = xRealloc(this->cpus, sizeof(CPUData)); + } else { + // on smp we need CPUs + 1 to store averages too (as kernel kindly provides that as well) + this->cpus = xRealloc(this->cpus, (super->existingCPUs + 1) * sizeof(CPUData)); + } + + len = sizeof(this->kernelFScale); + if (sysctlbyname("kern.fscale", &this->kernelFScale, &len, NULL, 0) == -1) { + //sane default for kernel provided CPU percentage scaling, at least on x86 machines, in case this sysctl call failed + this->kernelFScale = 2048; + } + + this->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf); + if (this->kd == NULL) { + CRT_fatalError("kvm_openfiles() failed"); + } + + return this; +} + +void Machine_delete(Machine* super) { + FreeBSDMachine* this = (FreeBSDMachine*) super; + + ProcessList_done(this); + + if (this->kd) { + kvm_close(this->kd); + } + + free(this->cp_time_o); + free(this->cp_time_n); + free(this->cp_times_o); + free(this->cp_times_n); + free(this->cpus); + + free(this); +} + +static inline void FreeBSDMachine_scanCPU(Machine* super) { + const FreeBSDMachine* this = (FreeBSDMachine*) super; + + unsigned int cpus = super->existingCPUs; // actual CPU count + unsigned int maxcpu = cpus; // max iteration (in case we have average + smp) + int cp_times_offset; + + assert(cpus > 0); + + size_t sizeof_cp_time_array; + + unsigned long* cp_time_n; // old clicks state + unsigned long* cp_time_o; // current clicks state + + unsigned long cp_time_d[CPUSTATES]; + double cp_time_p[CPUSTATES]; + + // get averages or single CPU clicks + sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES; + sysctl(MIB_kern_cp_time, 2, this->cp_time_n, &sizeof_cp_time_array, NULL, 0); + + // get rest of CPUs + if (cpus > 1) { + // on smp systems FreeBSD kernel concats all CPU states into one long array in + // kern.cp_times sysctl OID + // we store averages in this->cpus[0], and actual cores after that + maxcpu = cpus + 1; + sizeof_cp_time_array = cpus * sizeof(unsigned long) * CPUSTATES; + sysctl(MIB_kern_cp_times, 2, this->cp_times_n, &sizeof_cp_time_array, NULL, 0); + } + + for (unsigned int i = 0; i < maxcpu; i++) { + if (cpus == 1) { + // single CPU box + cp_time_n = this->cp_time_n; + cp_time_o = this->cp_time_o; + } else { + if (i == 0 ) { + // average + cp_time_n = this->cp_time_n; + cp_time_o = this->cp_time_o; + } else { + // specific smp cores + cp_times_offset = i - 1; + cp_time_n = this->cp_times_n + (cp_times_offset * CPUSTATES); + cp_time_o = this->cp_times_o + (cp_times_offset * CPUSTATES); + } + } + + // diff old vs new + unsigned long long total_o = 0; + unsigned long long total_n = 0; + unsigned long long total_d = 0; + for (int s = 0; s < CPUSTATES; s++) { + cp_time_d[s] = cp_time_n[s] - cp_time_o[s]; + total_o += cp_time_o[s]; + total_n += cp_time_n[s]; + } + + // totals + total_d = total_n - total_o; + if (total_d < 1 ) { + total_d = 1; + } + + // save current state as old and calc percentages + for (int s = 0; s < CPUSTATES; ++s) { + cp_time_o[s] = cp_time_n[s]; + cp_time_p[s] = ((double)cp_time_d[s]) / ((double)total_d) * 100; + } + + CPUData* cpuData = &(this->cpus[i]); + cpuData->userPercent = cp_time_p[CP_USER]; + cpuData->nicePercent = cp_time_p[CP_NICE]; + cpuData->systemPercent = cp_time_p[CP_SYS]; + cpuData->irqPercent = cp_time_p[CP_INTR]; + cpuData->systemAllPercent = cp_time_p[CP_SYS] + cp_time_p[CP_INTR]; + // this one is not really used + //cpuData->idlePercent = cp_time_p[CP_IDLE]; + + cpuData->temperature = NAN; + cpuData->frequency = NAN; + + const int coreId = (cpus == 1) ? 0 : ((int)i - 1); + if (coreId < 0) + continue; + + // TODO: test with hyperthreading and multi-cpu systems + if (super->settings->showCPUTemperature) { + int temperature; + size_t len = sizeof(temperature); + char mibBuffer[32]; + xSnprintf(mibBuffer, sizeof(mibBuffer), "dev.cpu.%d.temperature", coreId); + int r = sysctlbyname(mibBuffer, &temperature, &len, NULL, 0); + if (r == 0) + cpuData->temperature = (double)(temperature - 2732) / 10.0; // convert from deci-Kelvin to Celsius + } + + // TODO: test with hyperthreading and multi-cpu systems + if (super->settings->showCPUFrequency) { + int frequency; + size_t len = sizeof(frequency); + char mibBuffer[32]; + xSnprintf(mibBuffer, sizeof(mibBuffer), "dev.cpu.%d.freq", coreId); + int r = sysctlbyname(mibBuffer, &frequency, &len, NULL, 0); + if (r == 0) + cpuData->frequency = frequency; // keep in MHz + } + } + + // calculate max temperature and avg frequency for average meter and + // propagate frequency to all cores if only supplied for CPU 0 + if (cpus > 1) { + if (super->settings->showCPUTemperature) { + double maxTemp = NAN; + for (unsigned int i = 1; i < maxcpu; i++) { + const double coreTemp = this->cpus[i].temperature; + if (isnan(coreTemp)) + continue; + + maxTemp = MAXIMUM(maxTemp, coreTemp); + } + + this->cpus[0].temperature = maxTemp; + } + + if (super->settings->showCPUFrequency) { + const double coreZeroFreq = this->cpus[1].frequency; + double freqSum = coreZeroFreq; + if (!isnan(coreZeroFreq)) { + for (unsigned int i = 2; i < maxcpu; i++) { + if (isnan(this->cpus[i].frequency)) + this->cpus[i].frequency = coreZeroFreq; + + freqSum += this->cpus[i].frequency; + } + + this->cpus[0].frequency = freqSum / (maxcpu - 1); + } + } + } +} + +static void FreeBSDMachine_scanMemoryInfo(Machine* super) { + FreeBSDMachine* this = (FreeBSDMachine*) super; + + // @etosan: + // memory counter relationships seem to be these: + // total = active + wired + inactive + cache + free + // htop_used (unavail to anybody) = active + wired + // htop_cache (for cache meter) = buffers + cache + // user_free (avail to procs) = buffers + inactive + cache + free + // + // with ZFS ARC situation becomes bit muddled, as ARC behaves like "user_free" + // and belongs into cache, but is reported as wired by kernel + // + // htop_used = active + (wired - arc) + // htop_cache = buffers + cache + arc + u_long totalMem; + u_int memActive, memWire, cachedMem; + long buffersMem; + size_t len; + struct vmtotal vmtotal; + + //disabled for now, as it is always smaller than phycal amount of memory... + //...to avoid "where is my memory?" questions + //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(super->totalMem), &len, NULL, 0); + //super->totalMem *= this->pageSizeKb; + len = sizeof(totalMem); + sysctl(MIB_hw_physmem, 2, &(totalMem), &len, NULL, 0); + totalMem /= 1024; + super->totalMem = totalMem; + + len = sizeof(memActive); + sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0); + memActive *= this->pageSizeKb; + this->memActive = memActive; + + len = sizeof(memWire); + sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0); + memWire *= this->pageSizeKb; + this->memWire = memWire; + + len = sizeof(buffersMem); + sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0); + buffersMem /= 1024; + super->buffersMem = buffersMem; + + len = sizeof(cachedMem); + sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0); + cachedMem *= this->pageSizeKb; + super->cachedMem = cachedMem; + + len = sizeof(vmtotal); + sysctl(MIB_vm_vmtotal, 2, &(vmtotal), &len, NULL, 0); + super->sharedMem = vmtotal.t_rmshr * this->pageSizeKb; + + super->usedMem = this->memActive + this->memWire; + + struct kvm_swap swap[16]; + int nswap = kvm_getswapinfo(this->kd, swap, ARRAYSIZE(swap), 0); + super->totalSwap = 0; + super->usedSwap = 0; + for (int i = 0; i < nswap; i++) { + super->totalSwap += swap[i].ksw_total; + super->usedSwap += swap[i].ksw_used; + } + super->totalSwap *= this->pageSizeKb; + super->usedSwap *= this->pageSizeKb; +} + +void Machine_scan(Machine* super) { + FreeBSDMachine* this = (FreeBSDMachine*) super; + + openzfs_sysctl_updateArcStats(&this->zfs); + FreeBSDMachine_scanMemoryInfo(super); + FreeBSDMachine_scanCPU(super); +} + +bool Machine_isCPUonline(const Machine* host, unsigned int id) { + assert(id < host->existingCPUs); + + // TODO: support offline CPUs and hot swapping + (void) host; (void) id; + + return true; +} diff --git a/freebsd/FreeBSDMachine.h b/freebsd/FreeBSDMachine.h new file mode 100644 index 00000000..1a90534e --- /dev/null +++ b/freebsd/FreeBSDMachine.h @@ -0,0 +1,54 @@ +#ifndef HEADER_FreeBSDMachine +#define HEADER_FreeBSDMachine +/* +htop - FreeBSDMachine.h +(C) 2014 Hisham H. Muhammad +Released under the GNU GPLv2+, see the COPYING file +in the source distribution for its full text. +*/ + +#include +#include +#include + +#include "Hashtable.h" +#include "Machine.h" +#include "UsersTable.h" +#include "zfs/ZfsArcStats.h" + + +typedef struct CPUData_ { + double userPercent; + double nicePercent; + double systemPercent; + double irqPercent; + double systemAllPercent; + + double frequency; + double temperature; +} CPUData; + +typedef struct FreeBSDProcessList_ { + Machine super; + kvm_t* kd; + + int pageSize; + int pageSizeKb; + int kernelFScale; + + unsigned long long int memWire; + unsigned long long int memActive; + + ZfsArcStats zfs; + + CPUData* cpus; + + unsigned long* cp_time_o; + unsigned long* cp_time_n; + + unsigned long* cp_times_o; + unsigned long* cp_times_n; + +} FreeBSDProcessList; + +#endif diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index bd6e3aac..1cf32502 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -37,354 +37,25 @@ in the source distribution for its full text. #include "Scheduling.h" #include "Settings.h" #include "XUtils.h" -#include "generic/openzfs_sysctl.h" -#include "zfs/ZfsArcStats.h" -static int MIB_hw_physmem[2]; -static int MIB_vm_stats_vm_v_page_count[4]; -static int pageSize; -static int pageSizeKb; - -static int MIB_vm_stats_vm_v_wire_count[4]; -static int MIB_vm_stats_vm_v_active_count[4]; -static int MIB_vm_stats_vm_v_cache_count[4]; -static int MIB_vm_stats_vm_v_inactive_count[4]; -static int MIB_vm_stats_vm_v_free_count[4]; -static int MIB_vm_vmtotal[2]; - -static int MIB_vfs_bufspace[2]; - -static int MIB_kern_cp_time[2]; -static int MIB_kern_cp_times[2]; -static int kernelFScale; - ProcessList* ProcessList_new(Machine* host, Hashtable* pidMatchList) { - size_t len; - char errbuf[_POSIX2_LINE_MAX]; - FreeBSDProcessList* fpl = xCalloc(1, sizeof(FreeBSDProcessList)); - ProcessList* pl = (ProcessList*) fpl; - ProcessList_init(pl, Class(FreeBSDProcess), host, pidMatchList); - - // physical memory in system: hw.physmem - // physical page size: hw.pagesize - // usable pagesize : vm.stats.vm.v_page_size - len = 2; sysctlnametomib("hw.physmem", MIB_hw_physmem, &len); - - len = sizeof(pageSize); - if (sysctlbyname("vm.stats.vm.v_page_size", &pageSize, &len, NULL, 0) == -1) - CRT_fatalError("Cannot get pagesize by sysctl"); - pageSizeKb = pageSize / ONE_K; - - // usable page count vm.stats.vm.v_page_count - // actually usable memory : vm.stats.vm.v_page_count * vm.stats.vm.v_page_size - len = 4; sysctlnametomib("vm.stats.vm.v_page_count", MIB_vm_stats_vm_v_page_count, &len); - - len = 4; sysctlnametomib("vm.stats.vm.v_wire_count", MIB_vm_stats_vm_v_wire_count, &len); - len = 4; sysctlnametomib("vm.stats.vm.v_active_count", MIB_vm_stats_vm_v_active_count, &len); - len = 4; sysctlnametomib("vm.stats.vm.v_cache_count", MIB_vm_stats_vm_v_cache_count, &len); - len = 4; sysctlnametomib("vm.stats.vm.v_inactive_count", MIB_vm_stats_vm_v_inactive_count, &len); - len = 4; sysctlnametomib("vm.stats.vm.v_free_count", MIB_vm_stats_vm_v_free_count, &len); - len = 2; sysctlnametomib("vm.vmtotal", MIB_vm_vmtotal, &len); - - len = 2; sysctlnametomib("vfs.bufspace", MIB_vfs_bufspace, &len); - - openzfs_sysctl_init(&fpl->zfs); - openzfs_sysctl_updateArcStats(&fpl->zfs); - - int smp = 0; - len = sizeof(smp); - - if (sysctlbyname("kern.smp.active", &smp, &len, NULL, 0) != 0 || len != sizeof(smp)) { - smp = 0; - } + FreeBSDProcessList* this = xCalloc(1, sizeof(FreeBSDProcessList)); + ProcessList* super = &this->super; - int cpus = 1; - len = sizeof(cpus); - - if (smp) { - int err = sysctlbyname("kern.smp.cpus", &cpus, &len, NULL, 0); - if (err) { - cpus = 1; - } - } else { - cpus = 1; - } - - size_t sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES; - len = 2; sysctlnametomib("kern.cp_time", MIB_kern_cp_time, &len); - fpl->cp_time_o = xCalloc(CPUSTATES, sizeof(unsigned long)); - fpl->cp_time_n = xCalloc(CPUSTATES, sizeof(unsigned long)); - len = sizeof_cp_time_array; - - // fetch initial single (or average) CPU clicks from kernel - sysctl(MIB_kern_cp_time, 2, fpl->cp_time_o, &len, NULL, 0); - - // on smp box, fetch rest of initial CPU's clicks - if (cpus > 1) { - len = 2; sysctlnametomib("kern.cp_times", MIB_kern_cp_times, &len); - fpl->cp_times_o = xCalloc(cpus, sizeof_cp_time_array); - fpl->cp_times_n = xCalloc(cpus, sizeof_cp_time_array); - len = cpus * sizeof_cp_time_array; - sysctl(MIB_kern_cp_times, 2, fpl->cp_times_o, &len, NULL, 0); - } + ProcessList_init(super, Class(FreeBSDProcess), host, pidMatchList); - host->existingCPUs = MAXIMUM(cpus, 1); - // TODO: support offline CPUs and hot swapping - host->activeCPUs = host->existingCPUs; - - if (cpus == 1 ) { - fpl->cpus = xRealloc(fpl->cpus, sizeof(CPUData)); - } else { - // on smp we need CPUs + 1 to store averages too (as kernel kindly provides that as well) - fpl->cpus = xRealloc(fpl->cpus, (host->existingCPUs + 1) * sizeof(CPUData)); - } - - - len = sizeof(kernelFScale); - if (sysctlbyname("kern.fscale", &kernelFScale, &len, NULL, 0) == -1) { - //sane default for kernel provided CPU percentage scaling, at least on x86 machines, in case this sysctl call failed - kernelFScale = 2048; - } - - fpl->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf); - if (fpl->kd == NULL) { - CRT_fatalError("kvm_openfiles() failed"); - } - - return pl; + return this; } -void ProcessList_delete(ProcessList* this) { - const FreeBSDProcessList* fpl = (FreeBSDProcessList*) this; +void ProcessList_delete(ProcessList* super) { + FreeBSDProcessList* this = (FreeBSDProcessList*) super; - if (fpl->kd) { - kvm_close(fpl->kd); - } - - free(fpl->cp_time_o); - free(fpl->cp_time_n); - free(fpl->cp_times_o); - free(fpl->cp_times_n); - free(fpl->cpus); + ProcessList_done(super); - ProcessList_done(this); free(this); } -static inline void FreeBSDProcessList_scanCPU(ProcessList* pl) { - const FreeBSDProcessList* fpl = (FreeBSDProcessList*) pl; - const Machine* host = pl->host; - - unsigned int cpus = host->existingCPUs; // actual CPU count - unsigned int maxcpu = cpus; // max iteration (in case we have average + smp) - int cp_times_offset; - - assert(cpus > 0); - - size_t sizeof_cp_time_array; - - unsigned long* cp_time_n; // old clicks state - unsigned long* cp_time_o; // current clicks state - - unsigned long cp_time_d[CPUSTATES]; - double cp_time_p[CPUSTATES]; - - // get averages or single CPU clicks - sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES; - sysctl(MIB_kern_cp_time, 2, fpl->cp_time_n, &sizeof_cp_time_array, NULL, 0); - - // get rest of CPUs - if (cpus > 1) { - // on smp systems FreeBSD kernel concats all CPU states into one long array in - // kern.cp_times sysctl OID - // we store averages in fpl->cpus[0], and actual cores after that - maxcpu = cpus + 1; - sizeof_cp_time_array = cpus * sizeof(unsigned long) * CPUSTATES; - sysctl(MIB_kern_cp_times, 2, fpl->cp_times_n, &sizeof_cp_time_array, NULL, 0); - } - - for (unsigned int i = 0; i < maxcpu; i++) { - if (cpus == 1) { - // single CPU box - cp_time_n = fpl->cp_time_n; - cp_time_o = fpl->cp_time_o; - } else { - if (i == 0 ) { - // average - cp_time_n = fpl->cp_time_n; - cp_time_o = fpl->cp_time_o; - } else { - // specific smp cores - cp_times_offset = i - 1; - cp_time_n = fpl->cp_times_n + (cp_times_offset * CPUSTATES); - cp_time_o = fpl->cp_times_o + (cp_times_offset * CPUSTATES); - } - } - - // diff old vs new - unsigned long long total_o = 0; - unsigned long long total_n = 0; - unsigned long long total_d = 0; - for (int s = 0; s < CPUSTATES; s++) { - cp_time_d[s] = cp_time_n[s] - cp_time_o[s]; - total_o += cp_time_o[s]; - total_n += cp_time_n[s]; - } - - // totals - total_d = total_n - total_o; - if (total_d < 1 ) { - total_d = 1; - } - - // save current state as old and calc percentages - for (int s = 0; s < CPUSTATES; ++s) { - cp_time_o[s] = cp_time_n[s]; - cp_time_p[s] = ((double)cp_time_d[s]) / ((double)total_d) * 100; - } - - CPUData* cpuData = &(fpl->cpus[i]); - cpuData->userPercent = cp_time_p[CP_USER]; - cpuData->nicePercent = cp_time_p[CP_NICE]; - cpuData->systemPercent = cp_time_p[CP_SYS]; - cpuData->irqPercent = cp_time_p[CP_INTR]; - cpuData->systemAllPercent = cp_time_p[CP_SYS] + cp_time_p[CP_INTR]; - // this one is not really used - //cpuData->idlePercent = cp_time_p[CP_IDLE]; - - cpuData->temperature = NAN; - cpuData->frequency = NAN; - - const int coreId = (cpus == 1) ? 0 : ((int)i - 1); - if (coreId < 0) - continue; - - // TODO: test with hyperthreading and multi-cpu systems - if (host->settings->showCPUTemperature) { - int temperature; - size_t len = sizeof(temperature); - char mibBuffer[32]; - xSnprintf(mibBuffer, sizeof(mibBuffer), "dev.cpu.%d.temperature", coreId); - int r = sysctlbyname(mibBuffer, &temperature, &len, NULL, 0); - if (r == 0) - cpuData->temperature = (double)(temperature - 2732) / 10.0; // convert from deci-Kelvin to Celsius - } - - // TODO: test with hyperthreading and multi-cpu systems - if (host->settings->showCPUFrequency) { - int frequency; - size_t len = sizeof(frequency); - char mibBuffer[32]; - xSnprintf(mibBuffer, sizeof(mibBuffer), "dev.cpu.%d.freq", coreId); - int r = sysctlbyname(mibBuffer, &frequency, &len, NULL, 0); - if (r == 0) - cpuData->frequency = frequency; // keep in MHz - } - } - - // calculate max temperature and avg frequency for average meter and - // propagate frequency to all cores if only supplied for CPU 0 - if (cpus > 1) { - if (host->settings->showCPUTemperature) { - double maxTemp = NAN; - for (unsigned int i = 1; i < maxcpu; i++) { - const double coreTemp = fpl->cpus[i].temperature; - if (isnan(coreTemp)) - continue; - - maxTemp = MAXIMUM(maxTemp, coreTemp); - } - - fpl->cpus[0].temperature = maxTemp; - } - - if (host->settings->showCPUFrequency) { - const double coreZeroFreq = fpl->cpus[1].frequency; - double freqSum = coreZeroFreq; - if (!isnan(coreZeroFreq)) { - for (unsigned int i = 2; i < maxcpu; i++) { - if (isnan(fpl->cpus[i].frequency)) - fpl->cpus[i].frequency = coreZeroFreq; - - freqSum += fpl->cpus[i].frequency; - } - - fpl->cpus[0].frequency = freqSum / (maxcpu - 1); - } - } - } -} - -static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) { - FreeBSDProcessList* fpl = (FreeBSDProcessList*) pl; - Machine* host = pl->host; - - // @etosan: - // memory counter relationships seem to be these: - // total = active + wired + inactive + cache + free - // htop_used (unavail to anybody) = active + wired - // htop_cache (for cache meter) = buffers + cache - // user_free (avail to procs) = buffers + inactive + cache + free - // - // with ZFS ARC situation becomes bit muddled, as ARC behaves like "user_free" - // and belongs into cache, but is reported as wired by kernel - // - // htop_used = active + (wired - arc) - // htop_cache = buffers + cache + arc - u_long totalMem; - u_int memActive, memWire, cachedMem; - long buffersMem; - size_t len; - struct vmtotal vmtotal; - - //disabled for now, as it is always smaller than phycal amount of memory... - //...to avoid "where is my memory?" questions - //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(host->totalMem), &len, NULL, 0); - //host->totalMem *= pageSizeKb; - len = sizeof(totalMem); - sysctl(MIB_hw_physmem, 2, &(totalMem), &len, NULL, 0); - totalMem /= 1024; - host->totalMem = totalMem; - - len = sizeof(memActive); - sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0); - memActive *= pageSizeKb; - fpl->memActive = memActive; - - len = sizeof(memWire); - sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0); - memWire *= pageSizeKb; - fpl->memWire = memWire; - - len = sizeof(buffersMem); - sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0); - buffersMem /= 1024; - host->buffersMem = buffersMem; - - len = sizeof(cachedMem); - sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0); - cachedMem *= pageSizeKb; - host->cachedMem = cachedMem; - - len = sizeof(vmtotal); - sysctl(MIB_vm_vmtotal, 2, &(vmtotal), &len, NULL, 0); - host->sharedMem = vmtotal.t_rmshr * pageSizeKb; - - host->usedMem = fpl->memActive + fpl->memWire; - - struct kvm_swap swap[16]; - int nswap = kvm_getswapinfo(fpl->kd, swap, ARRAYSIZE(swap), 0); - host->totalSwap = 0; - host->usedSwap = 0; - for (int i = 0; i < nswap; i++) { - host->totalSwap += swap[i].ksw_total; - host->usedSwap += swap[i].ksw_used; - } - host->totalSwap *= pageSizeKb; - host->usedSwap *= pageSizeKb; -} - static void FreeBSDProcessList_updateExe(const struct kinfo_proc* kproc, Process* proc) { if (Process_isKernelThread(proc)) { Process_updateExe(proc, NULL); @@ -483,22 +154,14 @@ IGNORE_WCASTQUAL_END return NULL; } -void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { - FreeBSDProcessList* fpl = (FreeBSDProcessList*) super; +void ProcessList_goThroughEntries(ProcessList* super) { const Machine* host = super->host; + const FreeBSDMachine* fhost = (FreeBSDMachine*) host; + FreeBSDProcessList* fpl = (FreeBSDProcessList*) super; const Settings* settings = host->settings; bool hideKernelThreads = settings->hideKernelThreads; bool hideUserlandThreads = settings->hideUserlandThreads; - openzfs_sysctl_updateArcStats(&fpl->zfs); - FreeBSDProcessList_scanMemoryInfo(super); - FreeBSDProcessList_scanCPU(super); - - // in pause mode only gather global data for meters (CPU/memory/...) - if (pauseProcessUpdate) { - return; - } - int count = 0; const struct kinfo_proc* kprocs = kvm_getprocs(fpl->kd, KERN_PROC_PROC, 0, &count); @@ -521,14 +184,14 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { proc->st_uid = kproc->ki_uid; proc->starttime_ctime = kproc->ki_start.tv_sec; if (proc->starttime_ctime < 0) { - proc->starttime_ctime = super->host.realtimeMs / 1000; + proc->starttime_ctime = host->realtimeMs / 1000; } Process_fillStarttimeBuffer(proc); proc->user = UsersTable_getRef(host->usersTable, proc->st_uid); ProcessList_add(super, proc); FreeBSDProcessList_updateExe(kproc, proc); - FreeBSDProcessList_updateProcessName(fpl->kd, kproc, proc); + FreeBSDProcessList_updateProcessName(fhost->kd, kproc, proc); if (settings->ss->flags & PROCESS_FLAG_CWD) { FreeBSDProcessList_updateCwd(kproc, proc); @@ -559,7 +222,7 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { proc->user = UsersTable_getRef(host->usersTable, proc->st_uid); } if (settings->updateProcessNames) { - FreeBSDProcessList_updateProcessName(fpl->kd, kproc, proc); + FreeBSDProcessList_updateProcessName(fhost->kd, kproc, proc); } } @@ -567,11 +230,11 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { // from FreeBSD source /src/usr.bin/top/machine.c proc->m_virt = kproc->ki_size / ONE_K; - proc->m_resident = kproc->ki_rssize * pageSizeKb; + proc->m_resident = kproc->ki_rssize * fhost->pageSizeKb; proc->nlwp = kproc->ki_numthreads; proc->time = (kproc->ki_runtime + 5000) / 10000; - proc->percent_cpu = 100.0 * ((double)kproc->ki_pctcpu / (double)kernelFScale); + proc->percent_cpu = 100.0 * ((double)kproc->ki_pctcpu / (double)fhost->kernelFScale); proc->percent_mem = 100.0 * proc->m_resident / (double)(host->totalMem); Process_updateCPUFieldWidths(proc->percent_cpu); @@ -623,22 +286,3 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { proc->updated = true; } } - -Machine* Machine_new(UsersTable* usersTable, uid_t userId) { - Machine* this = xCalloc(1, sizeof(Machine)); - Machine_init(this, usersTable, userId); - return this; -} - -void Machine_delete(Machine* host) { - free(host); -} - -bool Machine_isCPUonline(const Machine* host, unsigned int id) { - assert(id < host->existingCPUs); - - // TODO: support offline CPUs and hot swapping - (void) host; (void) id; - - return true; -} diff --git a/freebsd/FreeBSDProcessList.h b/freebsd/FreeBSDProcessList.h index b7e29f8b..55247eb7 100644 --- a/freebsd/FreeBSDProcessList.h +++ b/freebsd/FreeBSDProcessList.h @@ -7,56 +7,15 @@ Released under the GNU GPLv2+, see the COPYING file in the source distribution for its full text. */ -#include #include #include #include "Hashtable.h" #include "ProcessList.h" #include "UsersTable.h" -#include "zfs/ZfsArcStats.h" - - -typedef struct CPUData_ { - double userPercent; - double nicePercent; - double systemPercent; - double irqPercent; - double systemAllPercent; - - double frequency; - double temperature; -} CPUData; typedef struct FreeBSDProcessList_ { ProcessList super; - kvm_t* kd; - - unsigned long long int memWire; - unsigned long long int memActive; - - ZfsArcStats zfs; - - CPUData* cpus; - - unsigned long* cp_time_o; - unsigned long* cp_time_n; - - unsigned long* cp_times_o; - unsigned long* cp_times_n; - } FreeBSDProcessList; -ProcessList* ProcessList_new(Machine* host, Hashtable* pidMatchList); - -void ProcessList_delete(ProcessList* this); - -void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate); - -Machine* Machine_new(UsersTable* usersTable, uid_t userId); - -bool Machine_isCPUonline(const Machine* host, unsigned int id); - -void Machine_delete(Machine* host); - #endif diff --git a/freebsd/Platform.c b/freebsd/Platform.c index 3ba2778e..0588b0fa 100644 --- a/freebsd/Platform.c +++ b/freebsd/Platform.c @@ -34,20 +34,19 @@ in the source distribution for its full text. #include "FileDescriptorMeter.h" #include "HostnameMeter.h" #include "LoadAverageMeter.h" +#include "Machine.h" #include "Macros.h" #include "MemoryMeter.h" #include "MemorySwapMeter.h" #include "Meter.h" #include "NetworkIOMeter.h" -#include "ProcessList.h" #include "Settings.h" #include "SwapMeter.h" #include "SysArchMeter.h" #include "TasksMeter.h" #include "UptimeMeter.h" #include "XUtils.h" -#include "freebsd/FreeBSDProcess.h" -#include "freebsd/FreeBSDProcessList.h" +#include "freebsd/FreeBSDMachine.h" #include "generic/fdstat_sysctl.h" #include "zfs/ZfsArcMeter.h" #include "zfs/ZfsCompressedArcMeter.h" @@ -194,15 +193,15 @@ int Platform_getMaxPid(void) { double Platform_setCPUValues(Meter* this, unsigned int cpu) { const Machine* host = this->host; - const FreeBSDProcessList* fpl = (const FreeBSDProcessList*) host->pl; + const FreeBSDMachine* fhost = (const FreeBSDMachine*) host; unsigned int cpus = host->activeCPUs; const CPUData* cpuData; if (cpus == 1) { - // single CPU box has everything in fpl->cpus[0] - cpuData = &(fpl->cpus[0]); + // single CPU box has everything in fhost->cpus[0] + cpuData = &(fhost->cpus[0]); } else { - cpuData = &(fpl->cpus[cpu]); + cpuData = &(fhost->cpus[cpu]); } double percent; @@ -210,7 +209,7 @@ double Platform_setCPUValues(Meter* this, unsigned int cpu) { v[CPU_METER_NICE] = cpuData->nicePercent; v[CPU_METER_NORMAL] = cpuData->userPercent; - if (host->settings->detailedCPUTime) { + if (super->settings->detailedCPUTime) { v[CPU_METER_KERNEL] = cpuData->systemPercent; v[CPU_METER_IRQ] = cpuData->irqPercent; this->curItems = 4; @@ -231,8 +230,7 @@ double Platform_setCPUValues(Meter* this, unsigned int cpu) { void Platform_setMemoryValues(Meter* this) { const Machine* host = this->host; - const ProcessList* pl = host->pl; - const FreeBSDProcessList* fpl = (const FreeBSDProcessList*) pl; + const FreeBSDMachine* fhost = (const FreeBSDMachine*) host; this->total = host->totalMem; this->values[MEMORY_METER_USED] = host->usedMem; @@ -242,11 +240,11 @@ void Platform_setMemoryValues(Meter* this) { this->values[MEMORY_METER_CACHE] = host->cachedMem; // this->values[MEMORY_METER_AVAILABLE] = "available memory" - if (fpl->zfs.enabled) { + if (dhost->zfs.enabled) { // ZFS does not shrink below the value of zfs_arc_min. unsigned long long int shrinkableSize = 0; - if (fpl->zfs.size > fpl->zfs.min) - shrinkableSize = fpl->zfs.size - fpl->zfs.min; + if (dhost->zfs.size > dhost->zfs.min) + shrinkableSize = dhost->zfs.size - dhost->zfs.min; this->values[MEMORY_METER_USED] -= shrinkableSize; this->values[MEMORY_METER_CACHE] += shrinkableSize; // this->values[MEMORY_METER_AVAILABLE] += shrinkableSize; @@ -263,15 +261,15 @@ void Platform_setSwapValues(Meter* this) { } void Platform_setZfsArcValues(Meter* this) { - const FreeBSDProcessList* fpl = (const FreeBSDProcessList*) this->host->pl; + const FreeBSDMachine* fhost = (const FreeBSDMachine*) this->host; - ZfsArcMeter_readStats(this, &(fpl->zfs)); + ZfsArcMeter_readStats(this, &fhost->zfs); } void Platform_setZfsCompressedArcValues(Meter* this) { - const FreeBSDProcessList* fpl = (const FreeBSDProcessList*) this->host->pl; + const FreeBSDMachine* fhost = (const FreeBSDMachine*) this->host; - ZfsCompressedArcMeter_readStats(this, &(fpl->zfs)); + ZfsCompressedArcMeter_readStats(this, &fhost->zfs); } char* Platform_getProcessEnv(pid_t pid) { -- cgit v1.2.3