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 headers to explicitly say GPLv2+
2021-09-22 09:33:00 +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;
PCP: support for 'dynamic columns' added at runtime Implements support for arbitrary Performance Co-Pilot metrics with per-process instance domains to form new htop columns. The column-to-metric mappings are setup using configuration files which will be documented via man pages as part of a follow-up commit. We provide an initial set of column configurations so as to provide new capabilities to pcp-htop: including configs for containers, open fd counts, scheduler run queue time, tcp/udp bytes/calls sent/recv, delay acct, virtual machine guests, detailed virtual memory, swap. Note there is a change to the configuration file path resolution algorithm introduced for 'dynamic meters'. First, look in any custom PCP_HTOP_DIR location. Then iterate, in priority order, users home directory, then local sysadmins files in /etc/pcp/htop, then readonly configuration files below /usr/share/pcp/htop. This final location becomes the preferred place for our own shipped meter and column files. The Settings file (htoprc) writing code is updated to not using the numeric identifier for dynamic columns. The same strategy used for dynamic meters is used here where we write Dynamic(name) so the name can be setup once more at start. Regular (static) columns writing to htoprc - i.e. numerically indexed - is unchanged.
2021-07-11 01:11:29 +00:00
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* dynamicColumns, 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