zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-03-01 06:13:24 +03:00
Code Issues Packages Projects Releases Wiki Activity
htop/linux/LinuxProcessList.h

121 lines
2.7 KiB
C
Raw Normal View History

Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
#ifndef HEADER_LinuxProcessList
#define HEADER_LinuxProcessList
/*
htop - LinuxProcessList.h
(C) 2014 Hisham H. Muhammad
Update License consistently to GPLv2 as per COPYING file
2020-10-05 09:51:32 +02:00
Released under the GNU GPLv2, see the COPYING file
Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
in the source distribution for its full text.
*/
Make all required includes explicit Information as seen by IWYU 0.12 + clang 9 on Linux
2020-09-19 13:55:23 +02:00
#include "config.h"
#include <stdbool.h>
#include <sys/types.h>
#include "Hashtable.h"
Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
#include "ProcessList.h"
Make all required includes explicit Information as seen by IWYU 0.12 + clang 9 on Linux
2020-09-19 13:55:23 +02:00
#include "UsersTable.h"
Zram Meter feature
2020-09-22 18:54:15 +07:00
#include "ZramStats.h"
Refactor common OpenZFS sysctl access Darwin and FreeBSD export zfs kstats through the same APIs, so moving functions into a common file.
2019-07-07 23:27:00 +00:00
#include "zfs/ZfsArcStats.h"
Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
Linux: individual huge page values in the huge page meter
2021-01-14 09:46:37 -05:00
#define HTOP_HUGEPAGE_BASE_SHIFT 16
#define HTOP_HUGEPAGE_COUNT 24
Zram Meter feature
2020-09-22 18:54:15 +07:00
Sorry about the mega-patch. This is a work-in-progress, code is currently broken. (Some actions, and notably, the header, are missing.)
2015-01-21 23:27:31 -02:00
typedef struct CPUData_ {
unsigned long long int totalTime;
unsigned long long int userTime;
unsigned long long int systemTime;
unsigned long long int systemAllTime;
unsigned long long int idleAllTime;
unsigned long long int idleTime;
unsigned long long int niceTime;
unsigned long long int ioWaitTime;
unsigned long long int irqTime;
unsigned long long int softIrqTime;
unsigned long long int stealTime;
unsigned long long int guestTime;
Clean up existing whitespace
2019-10-31 11:39:12 -05:00
Sorry about the mega-patch. This is a work-in-progress, code is currently broken. (Some actions, and notably, the header, are missing.)
2015-01-21 23:27:31 -02:00
unsigned long long int totalPeriod;
unsigned long long int userPeriod;
unsigned long long int systemPeriod;
unsigned long long int systemAllPeriod;
unsigned long long int idleAllPeriod;
unsigned long long int idlePeriod;
unsigned long long int nicePeriod;
unsigned long long int ioWaitPeriod;
unsigned long long int irqPeriod;
unsigned long long int softIrqPeriod;
unsigned long long int stealPeriod;
unsigned long long int guestPeriod;
Move sysfs-reading code to LinuxProcessList.c and add average frequency. This way the frequency is read from sysfs only once per update cycle instead of every time the UI is redrawn. This also changes the code to read from /proc/cpuinfo instead. This is because reading from scaling_cur_freq stalls for 10ms if the previous read for the file was more than one second ago. [1] Since htop's update cycle is longer than that, it would cause the read of each CPU's scaling_cur_freq file to block the UI for 20ms. This easily led to a noticeable half-second lag on a 20+ CPU machine. /proc/cpuinfo also has a 10ms delay, but this applies for the whole file so the delay does not scale with the number of CPUs. [2] [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4815d3c56d1e10449a44089a47544d9ba84fad0d [2]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7d5905dc14a87805a59f3c5bf70173aac2bb18f8
2019-08-10 22:19:32 -07:00
double frequency;
Show CPU temperature in CPU meter Show the CPU temperature in the CPU meter, like CPU frequency, instead of using an extra Meter.
2020-09-10 19:56:33 +02:00
Dynamically load libsensors at runtime
2020-12-01 13:59:19 +01:00
#ifdef HAVE_SENSORS_SENSORS_H
Show CPU temperature in CPU meter Show the CPU temperature in the CPU meter, like CPU frequency, instead of using an extra Meter.
2020-09-10 19:56:33 +02:00
double temperature;
#endif
Sorry about the mega-patch. This is a work-in-progress, code is currently broken. (Some actions, and notably, the header, are missing.)
2015-01-21 23:27:31 -02:00
} CPUData;
Interpret TTY_NR column on Linux, translate dev_t to major:minor on other platforms. Closes #316.
2016-10-01 03:09:04 -03:00
typedef struct TtyDriver_ {
char* path;
unsigned int major;
unsigned int minorFrom;
unsigned int minorTo;
} TtyDriver;
Sorry about the mega-patch. This is a work-in-progress, code is currently broken. (Some actions, and notably, the header, are missing.)
2015-01-21 23:27:31 -02:00
typedef struct LinuxProcessList_ {
ProcessList super;
Clean up existing whitespace
2019-10-31 11:39:12 -05:00
Sorry about the mega-patch. This is a work-in-progress, code is currently broken. (Some actions, and notably, the header, are missing.)
2015-01-21 23:27:31 -02:00
CPUData* cpus;
Interpret TTY_NR column on Linux, translate dev_t to major:minor on other platforms. Closes #316.
2016-10-01 03:09:04 -03:00
TtyDriver* ttyDrivers;
Linux: Use /proc/*/smaps_rollup for improved PSS parsing speed
2018-10-16 20:08:23 +02:00
bool haveSmapsRollup;
Clean up existing whitespace
2019-10-31 11:39:12 -05:00
Adds support for linux delay accounting (#667) Adds support for showing columns with linux delay accounting. This information can be read from the netlink interface, and thus we set up a socket to read from that when initializing the LinuxProcessList (LinuxProcessList_initNetlinkSocket). After that, for each process we call LinuxProcessList_readDelayAcctData, which sends a message thru the socket after setting up a callback to get the answer from the Kernel. That callback sets the process total delay time attribute. We then set the delay percent as the percentage of time process cpu time since last scan.
2017-12-04 00:15:29 -02:00
#ifdef HAVE_DELAYACCT
Spacing around operators
2020-10-31 23:28:02 +01:00
struct nl_sock* netlink_socket;
Adds support for linux delay accounting (#667) Adds support for showing columns with linux delay accounting. This information can be read from the netlink interface, and thus we set up a socket to read from that when initializing the LinuxProcessList (LinuxProcessList_initNetlinkSocket). After that, for each process we call LinuxProcessList_readDelayAcctData, which sends a message thru the socket after setting up a callback to get the answer from the Kernel. That callback sets the process total delay time attribute. We then set the delay percent as the percentage of time process cpu time since last scan.
2017-12-04 00:15:29 -02:00
int netlink_family;
#endif
ZFS arcstats for Linux If no pools are imported (ARC size == 0) or the ZFS module is not in the kernel (/proc/spl/kstat/zfs/arcstats does not exist), then the Meter reports "Unavailable".
2019-07-07 02:37:02 +00:00
Linux: overhaul memory partition Use similar calculation than procps. Show AvailableMemory in text mode. Use total minus available memory instead of manually computed used- memory as fraction part in bar mode (if available).
2021-01-06 18:11:24 +01:00
memory_t totalHugePageMem;
memory_t usedHugePageMem[HTOP_HUGEPAGE_COUNT];
memory_t availableMem;
Linux: handle hugepages Subtract hugepages from normal memory. Add a HugePageMeter. Closes: #447
2021-01-05 15:50:23 +01:00
Refactor common OpenZFS sysctl access Darwin and FreeBSD export zfs kstats through the same APIs, so moving functions into a common file.
2019-07-07 23:27:00 +00:00
ZfsArcStats zfs;
Zram Meter feature
2020-09-22 18:54:15 +07:00
ZramStats zram;
Sorry about the mega-patch. This is a work-in-progress, code is currently broken. (Some actions, and notably, the header, are missing.)
2015-01-21 23:27:31 -02:00
} LinuxProcessList;
Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
#ifndef PROCDIR
#define PROCDIR "/proc"
#endif
Move sysfs-reading code to LinuxProcessList.c and add average frequency. This way the frequency is read from sysfs only once per update cycle instead of every time the UI is redrawn. This also changes the code to read from /proc/cpuinfo instead. This is because reading from scaling_cur_freq stalls for 10ms if the previous read for the file was more than one second ago. [1] Since htop's update cycle is longer than that, it would cause the read of each CPU's scaling_cur_freq file to block the UI for 20ms. This easily led to a noticeable half-second lag on a 20+ CPU machine. /proc/cpuinfo also has a 10ms delay, but this applies for the whole file so the delay does not scale with the number of CPUs. [2] [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4815d3c56d1e10449a44089a47544d9ba84fad0d [2]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7d5905dc14a87805a59f3c5bf70173aac2bb18f8
2019-08-10 22:19:32 -07:00
#ifndef PROCCPUINFOFILE
#define PROCCPUINFOFILE PROCDIR "/cpuinfo"
#endif
Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
#ifndef PROCSTATFILE
#define PROCSTATFILE PROCDIR "/stat"
#endif
#ifndef PROCMEMINFOFILE
#define PROCMEMINFOFILE PROCDIR "/meminfo"
#endif
ZFS arcstats for Linux If no pools are imported (ARC size == 0) or the ZFS module is not in the kernel (/proc/spl/kstat/zfs/arcstats does not exist), then the Meter reports "Unavailable".
2019-07-07 02:37:02 +00:00
#ifndef PROCARCSTATSFILE
#define PROCARCSTATSFILE PROCDIR "/spl/kstat/zfs/arcstats"
#endif
Interpret TTY_NR column on Linux, translate dev_t to major:minor on other platforms. Closes #316.
2016-10-01 03:09:04 -03:00
#ifndef PROCTTYDRIVERSFILE
#define PROCTTYDRIVERSFILE PROCDIR "/tty/drivers"
#endif
Extend buffer for reading lines from /proc. Apparently a line longer than 255 chars was spotted in the wild: http://serverfault.com/questions/577939/linux-ps-htop-show-processes-running-for-hundreds-or-thousands-of-days-though-h#comment676098_577939
2015-12-14 13:27:11 -02:00
#ifndef PROC_LINE_LENGTH
Linux: add process->starttime and use it for STARTTIME column (#700) this way a remount of /proc will not reset starttimes and we can also see startup times for processes started before the mount of /proc also record btime (boot time in seconds since epoch) as Linux semi-global
2018-08-18 21:29:03 -07:00
#define PROC_LINE_LENGTH 4096
Extend buffer for reading lines from /proc. Apparently a line longer than 255 chars was spotted in the wild: http://serverfault.com/questions/577939/linux-ps-htop-show-processes-running-for-hundreds-or-thousands-of-days-though-h#comment676098_577939
2015-12-14 13:27:11 -02:00
#endif
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 17:44:56 +10:00
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* pidMatchList, uid_t userId);
Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
Remove superfluous 'extern's from function declarations. Applied via: $ find * -name '*.h' -exec sed -i -r 's/^extern (.+\()/\1/;' {} + Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com>
2020-09-02 02:38:44 -05:00
void ProcessList_delete(ProcessList* pl);
Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
Continue to update generic data in paused mode Generic data, as CPU and memory usage, are used by Meters. In paused mode they would stop receiving updates and especially Graph Meters would stop showing continuous data. Improves: #214 Closes: #253
2020-10-13 16:03:37 +02:00
void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate);
Move platform-dependent parts of Linux battery meter.
2014-11-27 21:02:52 -02:00
#endif
Reference in New Issue Copy Permalink