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

57 lines
1.4 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;
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
} CPUData;
typedef struct OpenBSDProcessList_ {
ProcessList super;
kvm_t* kd;
CPUData* cpus;
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;
Switch variable/field naming from WhiteList to MatchList
2020-09-09 09:38:15 +00:00
ProcessList* ProcessList_new(UsersTable* usersTable, 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
#endif