mirror of
https://github.com/xzeldon/htop.git
synced 2025-01-13 02:06:49 +03:00
9197adf57e
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.
73 lines
1.7 KiB
C
73 lines
1.7 KiB
C
/* Do not edit this file. It was automatically generated. */
|
|
|
|
#ifndef HEADER_OpenBSDProcessList
|
|
#define HEADER_OpenBSDProcessList
|
|
/*
|
|
htop - OpenBSDProcessList.h
|
|
(C) 2014 Hisham H. Muhammad
|
|
(C) 2015 Michael McConville
|
|
Released under the GNU GPL, see the COPYING file
|
|
in the source distribution for its full text.
|
|
*/
|
|
|
|
|
|
#include <kvm.h>
|
|
|
|
typedef struct CPUData_ {
|
|
unsigned long long int totalTime;
|
|
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;
|
|
|
|
unsigned long long int totalPeriod;
|
|
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;
|
|
} CPUData;
|
|
|
|
typedef struct OpenBSDProcessList_ {
|
|
ProcessList super;
|
|
kvm_t* kd;
|
|
|
|
CPUData* cpus;
|
|
|
|
} OpenBSDProcessList;
|
|
|
|
|
|
/*
|
|
* avoid relying on or conflicting with MIN() and MAX() in sys/param.h
|
|
*/
|
|
#ifndef MINIMUM
|
|
#define MINIMUM(x, y) ((x) > (y) ? (y) : (x))
|
|
#endif
|
|
|
|
#ifndef MAXIMUM
|
|
#define MAXIMUM(x, y) ((x) > (y) ? (x) : (y))
|
|
#endif
|
|
|
|
#ifndef CLAMP
|
|
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : MAXIMUM(x, low))
|
|
#endif
|
|
|
|
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
|
|
|
|
void ProcessList_delete(ProcessList* this);
|
|
|
|
char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd);
|
|
|
|
/*
|
|
* Taken from OpenBSD's ps(1).
|
|
*/
|
|
void ProcessList_goThroughEntries(ProcessList* this);
|
|
|
|
|
|
#endif
|