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

61 lines
1.5 KiB
C
Raw Normal View History

(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
#ifndef HEADER_OpenBSDProcessList
#define HEADER_OpenBSDProcessList
/*
htop - OpenBSDProcessList.h
(C) 2014 Hisham H. Muhammad
(C) 2015 Michael McConville
Update License consistently to GPLv2 as per COPYING file
2020-10-05 07:51:32 +00:00
Released under the GNU GPLv2, see the COPYING file
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
in the source distribution for its full text.
*/
#include <kvm.h>
OpenBSD update - compilation failures like `return &this->this;` -> `return &this->super;` - iwyu update - misc cleanup
2020-12-05 21:57:07 +00:00
#include <stdbool.h>
#include <sys/types.h>
#include "Hashtable.h"
#include "ProcessList.h"
#include "UsersTable.h"
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
typedef struct CPUData_ {
unsigned long long int totalTime;
Fix CPU usage on OpenBSD The current OpenBSD-specific CPU usage code is broken. The `cpu` parameter of `Platform_setCPUValues` is an integer in the interval [0, cpuCount], not [0, cpuCount-1]: Actual CPUs are numbered from 1, the “zero” CPU is a “virtual” one which represents the average of actual CPUs (I guess it’s inherited from Linux’s `/proc/stats`). This off-by-one error leads to random crashes. Moreover, the displayed CPU usage is more detailed with system, user and nice times. I made the OpenBSD CPU code more similar to the Linux CPU code, removing a few old bits from OpenBSD’s top(1). I think it will be easier to understand, maintain and evolve. I’d love some feedback from experienced OpenBSD people.
2018-12-16 08:25:54 +00:00
unsigned long long int userTime;
unsigned long long int niceTime;
unsigned long long int sysTime;
unsigned long long int sysAllTime;
unsigned long long int spinTime;
unsigned long long int intrTime;
unsigned long long int idleTime;
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
unsigned long long int totalPeriod;
Fix CPU usage on OpenBSD The current OpenBSD-specific CPU usage code is broken. The `cpu` parameter of `Platform_setCPUValues` is an integer in the interval [0, cpuCount], not [0, cpuCount-1]: Actual CPUs are numbered from 1, the “zero” CPU is a “virtual” one which represents the average of actual CPUs (I guess it’s inherited from Linux’s `/proc/stats`). This off-by-one error leads to random crashes. Moreover, the displayed CPU usage is more detailed with system, user and nice times. I made the OpenBSD CPU code more similar to the Linux CPU code, removing a few old bits from OpenBSD’s top(1). I think it will be easier to understand, maintain and evolve. I’d love some feedback from experienced OpenBSD people.
2018-12-16 08:25:54 +00:00
unsigned long long int userPeriod;
unsigned long long int nicePeriod;
unsigned long long int sysPeriod;
unsigned long long int sysAllPeriod;
unsigned long long int spinPeriod;
unsigned long long int intrPeriod;
unsigned long long int idlePeriod;
don't include offline CPUs in summary for OpenBSD By default, OpenBSD disables SMT (hyperthreading) cpu pseudo-cores. This can be changed at runtime by setting the hw.smt sysctl so they may become active later, therefore they are still present in cpu stat structures but are marked as offline. As done with native top(1), this drops them from the cpu summary graphs.
2021-03-27 13:26:26 +00:00
OpenBSD: support offline CPUs and hot-swapping
2021-06-13 12:24:51 +00:00
bool online;
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
} CPUData;
typedef struct OpenBSDProcessList_ {
ProcessList super;
kvm_t* kd;
OpenBSD: support offline CPUs and hot-swapping
2021-06-13 12:24:51 +00:00
CPUData* cpuData;
OpenBSD: update * Set process data for: - minflt - majflt - processor - nlwp * Drop unimplemented nlwp column * Scan userland threads * Mark a 'Thread is currently on a CPU.' with 'R', and processes 'Currently runnable' with 'P', do confine with man:ps(1) and Linux. See https://man.openbsd.org/ps.1 * Show CPU frequency
2021-03-19 16:34:12 +00:00
int cpuSpeed;
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
} OpenBSDProcessList;
Add a new DynamicMeter class for runtime Meter extension This commit is based on exploratory work by Sohaib Mohamed. The end goal is two-fold - to support addition of Meters we build via configuration files for both the PCP platform and for scripts ( https://github.com/htop-dev/htop/issues/526 ) Here, we focus on generic code and the PCP support. A new class DynamicMeter is introduced - it uses the special case 'param' field handling that previously was used only by the CPUMeter, such that every runtime-configured Meter is given a unique identifier. Unlike with the CPUMeter this is used internally only. When reading/writing to htoprc instead of CPU(N) - where N is an integer param (CPU number) - we use the string name for each meter. For example, if we have a configuration for a DynamicMeter for some Redis metrics, we might read and write "Dynamic(redis)". This identifier is subsequently matched (back) up to the configuration file so we're able to re-create arbitrary user configurations. The PCP platform configuration file format is fairly simple. We expand configs from several directories, including the users homedir alongside htoprc (below htop/meters/) and also /etc/pcp/htop/meters. The format will be described via a new pcp-htop(5) man page, but its basically ini-style and each Meter has one or more metric expressions associated, as well as specifications for labels, color and so on via a dot separated notation for individual metrics within the Meter. A few initial sample configuration files are provided below ./pcp/meters that give the general idea. The PCP "derived" metric specification - see pmRegisterDerived(3) - is used as the syntax for specifying metrics in PCP DynamicMeters.
2021-06-23 07:44:56 +00:00
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* pidMatchList, uid_t userId);
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
void ProcessList_delete(ProcessList* this);
Unify function argument names Name first argument of ProcessList_goThroughEntries consistently super Name first argument of ProcessList_new consistently userTable
2020-10-27 20:26:28 +00:00
void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate);
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
Add ProcessList_isCPUonline
2021-06-12 20:04:37 +00:00
bool ProcessList_isCPUonline(const ProcessList* super, unsigned int id);
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
#endif