2021-09-23 00:06:38 +00:00
|
|
|
if !HTOP_PCP
|
|
|
|
bin_PROGRAMS = htop
|
|
|
|
myhtopplatprogram = htop.c
|
|
|
|
else
|
|
|
|
bin_PROGRAMS = pcp-htop
|
|
|
|
myhtopplatprogram = pcp-htop.c
|
|
|
|
endif
|
|
|
|
|
2006-03-04 18:16:49 +00:00
|
|
|
dist_man_MANS = htop.1
|
2021-01-22 18:14:53 +00:00
|
|
|
EXTRA_DIST = \
|
|
|
|
$(dist_man_MANS) \
|
|
|
|
autogen.sh \
|
|
|
|
htop.desktop \
|
|
|
|
htop.png \
|
|
|
|
htop.svg \
|
|
|
|
build-aux/compile \
|
|
|
|
build-aux/depcomp \
|
|
|
|
build-aux/install-sh \
|
|
|
|
build-aux/missing
|
2006-03-04 18:16:49 +00:00
|
|
|
applicationsdir = $(datadir)/applications
|
|
|
|
applications_DATA = htop.desktop
|
|
|
|
pixmapdir = $(datadir)/pixmaps
|
|
|
|
pixmap_DATA = htop.png
|
2020-11-30 15:17:09 +00:00
|
|
|
appicondir = $(datadir)/icons/hicolor/scalable/apps
|
|
|
|
appicon_DATA = htop.svg
|
2006-03-04 18:16:49 +00:00
|
|
|
|
2021-01-29 15:44:23 +00:00
|
|
|
AM_CFLAGS += -pedantic -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR="\"$(sysconfdir)\"" -I"$(top_srcdir)/$(my_htop_platform)"
|
2018-03-16 14:31:48 +00:00
|
|
|
AM_LDFLAGS =
|
2006-03-04 18:16:49 +00:00
|
|
|
|
2020-10-05 11:52:58 +00:00
|
|
|
myhtopsources = \
|
|
|
|
Action.c \
|
|
|
|
Affinity.c \
|
|
|
|
AffinityPanel.c \
|
|
|
|
AvailableColumnsPanel.c \
|
|
|
|
AvailableMetersPanel.c \
|
|
|
|
BatteryMeter.c \
|
|
|
|
CategoriesPanel.c \
|
|
|
|
ClockMeter.c \
|
|
|
|
ColorsPanel.c \
|
|
|
|
ColumnsPanel.c \
|
2021-03-23 04:04:54 +00:00
|
|
|
CommandLine.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
CommandScreen.c \
|
2020-10-26 20:16:43 +00:00
|
|
|
Compat.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
CPUMeter.c \
|
|
|
|
CRT.c \
|
|
|
|
DateMeter.c \
|
|
|
|
DateTimeMeter.c \
|
|
|
|
DiskIOMeter.c \
|
|
|
|
DisplayOptionsPanel.c \
|
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
|
|
|
DynamicColumn.c \
|
2021-06-23 07:44:56 +00:00
|
|
|
DynamicMeter.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
EnvScreen.c \
|
|
|
|
FunctionBar.c \
|
|
|
|
Hashtable.c \
|
|
|
|
Header.c \
|
2020-12-25 15:42:35 +00:00
|
|
|
HeaderOptionsPanel.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
HostnameMeter.c \
|
|
|
|
IncSet.c \
|
|
|
|
InfoScreen.c \
|
|
|
|
ListItem.c \
|
|
|
|
LoadAverageMeter.c \
|
|
|
|
MainPanel.c \
|
|
|
|
MemoryMeter.c \
|
2021-08-10 19:32:05 +00:00
|
|
|
MemorySwapMeter.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
Meter.c \
|
|
|
|
MetersPanel.c \
|
2020-10-08 14:34:54 +00:00
|
|
|
NetworkIOMeter.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
Object.c \
|
|
|
|
OpenFilesScreen.c \
|
2020-11-21 20:40:08 +00:00
|
|
|
OptionItem.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
Panel.c \
|
|
|
|
Process.c \
|
|
|
|
ProcessList.c \
|
2020-11-11 21:15:35 +00:00
|
|
|
ProcessLocksScreen.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
RichString.c \
|
|
|
|
ScreenManager.c \
|
2021-08-31 05:38:52 +00:00
|
|
|
ScreensPanel.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
Settings.c \
|
|
|
|
SignalsPanel.c \
|
|
|
|
SwapMeter.c \
|
2021-01-27 09:45:48 +00:00
|
|
|
SysArchMeter.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
TasksMeter.c \
|
|
|
|
TraceScreen.c \
|
|
|
|
UptimeMeter.c \
|
2022-06-07 19:16:47 +00:00
|
|
|
FreqMeter.c \
|
|
|
|
TempMeter.c \
|
2020-10-05 11:52:58 +00:00
|
|
|
UsersTable.c \
|
|
|
|
Vector.c \
|
2020-10-14 18:21:09 +00:00
|
|
|
XUtils.c
|
2020-10-05 11:52:58 +00:00
|
|
|
|
|
|
|
myhtopheaders = \
|
|
|
|
Action.h \
|
|
|
|
Affinity.h \
|
|
|
|
AffinityPanel.h \
|
|
|
|
AvailableColumnsPanel.h \
|
|
|
|
AvailableMetersPanel.h \
|
|
|
|
BatteryMeter.h \
|
|
|
|
CPUMeter.h \
|
|
|
|
CRT.h \
|
|
|
|
CategoriesPanel.h \
|
|
|
|
ClockMeter.h \
|
|
|
|
ColorsPanel.h \
|
|
|
|
ColumnsPanel.h \
|
2021-03-23 04:04:54 +00:00
|
|
|
CommandLine.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
CommandScreen.h \
|
2020-10-26 20:16:43 +00:00
|
|
|
Compat.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
DateMeter.h \
|
|
|
|
DateTimeMeter.h \
|
2020-10-08 14:20:34 +00:00
|
|
|
DiskIOMeter.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
DisplayOptionsPanel.h \
|
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
|
|
|
DynamicColumn.h \
|
2021-06-23 07:44:56 +00:00
|
|
|
DynamicMeter.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
EnvScreen.h \
|
|
|
|
FunctionBar.h \
|
|
|
|
Hashtable.h \
|
|
|
|
Header.h \
|
2020-12-25 15:42:35 +00:00
|
|
|
HeaderLayout.h \
|
|
|
|
HeaderOptionsPanel.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
HostnameMeter.h \
|
|
|
|
IncSet.h \
|
|
|
|
InfoScreen.h \
|
|
|
|
ListItem.h \
|
|
|
|
LoadAverageMeter.h \
|
|
|
|
Macros.h \
|
|
|
|
MainPanel.h \
|
|
|
|
MemoryMeter.h \
|
2021-08-10 19:32:05 +00:00
|
|
|
MemorySwapMeter.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
Meter.h \
|
|
|
|
MetersPanel.h \
|
2020-10-08 14:34:54 +00:00
|
|
|
NetworkIOMeter.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
Object.h \
|
|
|
|
OpenFilesScreen.h \
|
2020-11-21 20:40:08 +00:00
|
|
|
OptionItem.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
Panel.h \
|
|
|
|
Process.h \
|
|
|
|
ProcessList.h \
|
2020-11-11 21:15:35 +00:00
|
|
|
ProcessLocksScreen.h \
|
2020-09-19 11:55:23 +00:00
|
|
|
ProvideCurses.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
RichString.h \
|
|
|
|
ScreenManager.h \
|
2021-08-31 05:38:52 +00:00
|
|
|
ScreensPanel.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
Settings.h \
|
|
|
|
SignalsPanel.h \
|
|
|
|
SwapMeter.h \
|
2021-01-27 09:45:48 +00:00
|
|
|
SysArchMeter.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
TasksMeter.h \
|
|
|
|
TraceScreen.h \
|
|
|
|
UptimeMeter.h \
|
2022-06-07 19:16:47 +00:00
|
|
|
FreqMeter.h \
|
|
|
|
TempMeter.h \
|
2020-10-05 11:52:58 +00:00
|
|
|
UsersTable.h \
|
|
|
|
Vector.h \
|
2020-10-14 18:21:09 +00:00
|
|
|
XUtils.h
|
2014-11-24 20:55:03 +00:00
|
|
|
|
2018-03-17 01:42:52 +00:00
|
|
|
# Linux
|
|
|
|
# -----
|
|
|
|
|
|
|
|
linux_platform_headers = \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.h \
|
|
|
|
generic/uname.h \
|
2021-10-19 21:36:31 +00:00
|
|
|
linux/CGroupUtils.h \
|
2021-01-05 14:50:23 +00:00
|
|
|
linux/HugePageMeter.h \
|
2018-03-17 01:42:52 +00:00
|
|
|
linux/IOPriority.h \
|
2020-10-07 15:18:02 +00:00
|
|
|
linux/IOPriorityPanel.h \
|
2020-12-01 12:59:19 +00:00
|
|
|
linux/LibSensors.h \
|
2018-03-17 01:42:52 +00:00
|
|
|
linux/LinuxProcess.h \
|
|
|
|
linux/LinuxProcessList.h \
|
2020-10-07 15:18:02 +00:00
|
|
|
linux/Platform.h \
|
2020-08-20 08:24:35 +00:00
|
|
|
linux/PressureStallMeter.h \
|
2020-12-15 18:44:48 +00:00
|
|
|
linux/ProcessField.h \
|
2020-10-07 15:18:02 +00:00
|
|
|
linux/SELinuxMeter.h \
|
2020-10-07 13:42:13 +00:00
|
|
|
linux/SystemdMeter.h \
|
2020-09-22 11:54:15 +00:00
|
|
|
linux/ZramMeter.h \
|
|
|
|
linux/ZramStats.h \
|
2019-07-07 23:27:00 +00:00
|
|
|
zfs/ZfsArcMeter.h \
|
2020-10-07 15:18:02 +00:00
|
|
|
zfs/ZfsArcStats.h \
|
|
|
|
zfs/ZfsCompressedArcMeter.h
|
2018-03-17 01:42:52 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
linux_platform_sources = \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.c \
|
|
|
|
generic/uname.c \
|
2021-10-19 21:36:31 +00:00
|
|
|
linux/CGroupUtils.c \
|
2021-01-05 14:50:23 +00:00
|
|
|
linux/HugePageMeter.c \
|
2020-10-07 15:18:02 +00:00
|
|
|
linux/IOPriorityPanel.c \
|
2020-12-01 12:59:19 +00:00
|
|
|
linux/LibSensors.c \
|
2020-10-07 15:18:02 +00:00
|
|
|
linux/LinuxProcess.c \
|
|
|
|
linux/LinuxProcessList.c \
|
|
|
|
linux/Platform.c \
|
|
|
|
linux/PressureStallMeter.c \
|
|
|
|
linux/SELinuxMeter.c \
|
2020-10-07 13:42:13 +00:00
|
|
|
linux/SystemdMeter.c \
|
2020-09-22 11:54:15 +00:00
|
|
|
linux/ZramMeter.c \
|
2020-10-07 15:18:02 +00:00
|
|
|
zfs/ZfsArcMeter.c \
|
|
|
|
zfs/ZfsCompressedArcMeter.c
|
2014-11-24 20:55:03 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
if HTOP_LINUX
|
|
|
|
AM_LDFLAGS += -rdynamic
|
2018-03-17 01:42:52 +00:00
|
|
|
myhtopplatheaders = $(linux_platform_headers)
|
2021-03-02 23:59:28 +00:00
|
|
|
myhtopplatsources = $(linux_platform_sources)
|
2014-11-24 20:55:03 +00:00
|
|
|
endif
|
|
|
|
|
2018-03-17 01:42:52 +00:00
|
|
|
# FreeBSD
|
|
|
|
# -------
|
|
|
|
|
|
|
|
freebsd_platform_headers = \
|
|
|
|
freebsd/FreeBSDProcessList.h \
|
|
|
|
freebsd/FreeBSDProcess.h \
|
2020-12-15 18:44:48 +00:00
|
|
|
freebsd/Platform.h \
|
|
|
|
freebsd/ProcessField.h \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.h \
|
|
|
|
generic/openzfs_sysctl.h \
|
|
|
|
generic/uname.h \
|
2019-07-07 23:27:00 +00:00
|
|
|
zfs/ZfsArcMeter.h \
|
|
|
|
zfs/ZfsArcStats.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
zfs/ZfsCompressedArcMeter.h
|
2018-03-17 01:42:52 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
freebsd_platform_sources = \
|
|
|
|
freebsd/Platform.c \
|
|
|
|
freebsd/FreeBSDProcessList.c \
|
|
|
|
freebsd/FreeBSDProcess.c \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.c \
|
|
|
|
generic/openzfs_sysctl.c \
|
|
|
|
generic/uname.c \
|
|
|
|
zfs/ZfsArcMeter.c \
|
|
|
|
zfs/ZfsCompressedArcMeter.c
|
2014-11-27 18:27:34 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
if HTOP_FREEBSD
|
2018-03-17 01:42:52 +00:00
|
|
|
myhtopplatheaders = $(freebsd_platform_headers)
|
2021-03-02 23:59:28 +00:00
|
|
|
myhtopplatsources = $(freebsd_platform_sources)
|
2014-11-27 18:27:34 +00:00
|
|
|
endif
|
|
|
|
|
2018-03-17 01:42:52 +00:00
|
|
|
# DragonFlyBSD
|
|
|
|
# ------------
|
|
|
|
|
|
|
|
dragonflybsd_platform_headers = \
|
|
|
|
dragonflybsd/DragonFlyBSDProcessList.h \
|
2020-12-15 18:44:48 +00:00
|
|
|
dragonflybsd/DragonFlyBSDProcess.h \
|
|
|
|
dragonflybsd/Platform.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
dragonflybsd/ProcessField.h \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.h \
|
|
|
|
generic/uname.h
|
2018-03-17 01:42:52 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
dragonflybsd_platform_sources = \
|
2020-12-20 17:21:25 +00:00
|
|
|
dragonflybsd/DragonFlyBSDProcessList.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
dragonflybsd/DragonFlyBSDProcess.c \
|
|
|
|
dragonflybsd/Platform.c \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.c \
|
|
|
|
generic/uname.c
|
2017-04-19 14:12:17 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
if HTOP_DRAGONFLYBSD
|
2018-03-17 01:42:52 +00:00
|
|
|
myhtopplatheaders = $(dragonflybsd_platform_headers)
|
2021-03-02 23:59:28 +00:00
|
|
|
myhtopplatsources = $(dragonflybsd_platform_sources)
|
2017-04-19 14:12:17 +00:00
|
|
|
endif
|
|
|
|
|
2021-03-15 07:44:39 +00:00
|
|
|
# NetBSD
|
|
|
|
# -------
|
|
|
|
|
|
|
|
netbsd_platform_headers = \
|
2021-04-09 02:18:52 +00:00
|
|
|
generic/gettime.h \
|
|
|
|
generic/hostname.h \
|
|
|
|
generic/uname.h \
|
2021-03-15 07:44:39 +00:00
|
|
|
netbsd/Platform.h \
|
|
|
|
netbsd/ProcessField.h \
|
|
|
|
netbsd/NetBSDProcess.h \
|
2021-04-09 02:18:52 +00:00
|
|
|
netbsd/NetBSDProcessList.h
|
2021-03-15 07:44:39 +00:00
|
|
|
|
|
|
|
netbsd_platform_sources = \
|
2021-04-09 02:18:52 +00:00
|
|
|
generic/gettime.c \
|
|
|
|
generic/hostname.c \
|
|
|
|
generic/uname.c \
|
2021-03-15 07:44:39 +00:00
|
|
|
netbsd/Platform.c \
|
|
|
|
netbsd/NetBSDProcess.c \
|
2021-04-09 02:18:52 +00:00
|
|
|
netbsd/NetBSDProcessList.c
|
2021-03-15 07:44:39 +00:00
|
|
|
|
|
|
|
if HTOP_NETBSD
|
|
|
|
myhtopplatheaders = $(netbsd_platform_headers)
|
|
|
|
myhtopplatsources = $(netbsd_platform_sources)
|
|
|
|
endif
|
|
|
|
|
2018-03-17 01:42:52 +00:00
|
|
|
# OpenBSD
|
|
|
|
# -------
|
|
|
|
|
|
|
|
openbsd_platform_headers = \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.h \
|
|
|
|
generic/uname.h \
|
2018-03-17 01:42:52 +00:00
|
|
|
openbsd/OpenBSDProcessList.h \
|
2020-12-15 18:44:48 +00:00
|
|
|
openbsd/OpenBSDProcess.h \
|
|
|
|
openbsd/Platform.h \
|
|
|
|
openbsd/ProcessField.h
|
2018-03-17 01:42:52 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
openbsd_platform_sources = \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.c \
|
|
|
|
generic/uname.c \
|
|
|
|
openbsd/OpenBSDProcessList.c \
|
|
|
|
openbsd/OpenBSDProcess.c \
|
|
|
|
openbsd/Platform.c
|
2015-09-18 04:46:48 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
if HTOP_OPENBSD
|
2018-03-17 01:42:52 +00:00
|
|
|
myhtopplatheaders = $(openbsd_platform_headers)
|
2021-03-02 23:59:28 +00:00
|
|
|
myhtopplatsources = $(openbsd_platform_sources)
|
2015-09-18 04:46:48 +00:00
|
|
|
endif
|
|
|
|
|
2018-03-17 01:42:52 +00:00
|
|
|
# Darwin
|
|
|
|
# ------
|
|
|
|
|
|
|
|
darwin_platform_headers = \
|
|
|
|
darwin/DarwinProcess.h \
|
|
|
|
darwin/DarwinProcessList.h \
|
2020-12-15 18:44:48 +00:00
|
|
|
darwin/Platform.h \
|
2021-08-22 16:30:08 +00:00
|
|
|
darwin/PlatformHelpers.h \
|
2020-12-15 18:44:48 +00:00
|
|
|
darwin/ProcessField.h \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.h \
|
|
|
|
generic/openzfs_sysctl.h \
|
|
|
|
generic/uname.h \
|
2019-07-07 23:27:00 +00:00
|
|
|
zfs/ZfsArcMeter.h \
|
|
|
|
zfs/ZfsArcStats.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
zfs/ZfsCompressedArcMeter.h
|
|
|
|
|
|
|
|
darwin_platform_sources = \
|
|
|
|
darwin/Platform.c \
|
2021-08-22 16:30:08 +00:00
|
|
|
darwin/PlatformHelpers.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
darwin/DarwinProcess.c \
|
|
|
|
darwin/DarwinProcessList.c \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.c \
|
|
|
|
generic/openzfs_sysctl.c \
|
|
|
|
generic/uname.c \
|
|
|
|
zfs/ZfsArcMeter.c \
|
|
|
|
zfs/ZfsCompressedArcMeter.c
|
2018-03-17 01:42:52 +00:00
|
|
|
|
2015-07-12 18:47:43 +00:00
|
|
|
if HTOP_DARWIN
|
2018-03-16 14:31:48 +00:00
|
|
|
AM_LDFLAGS += -framework IOKit -framework CoreFoundation
|
2018-03-17 01:42:52 +00:00
|
|
|
myhtopplatheaders = $(darwin_platform_headers)
|
2021-03-02 23:59:28 +00:00
|
|
|
myhtopplatsources = $(darwin_platform_sources)
|
2015-07-12 18:47:43 +00:00
|
|
|
endif
|
|
|
|
|
2018-03-17 01:42:52 +00:00
|
|
|
# Solaris
|
|
|
|
# -------
|
|
|
|
|
|
|
|
solaris_platform_headers = \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.h \
|
|
|
|
generic/uname.h \
|
2020-12-15 18:44:48 +00:00
|
|
|
solaris/ProcessField.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
solaris/Platform.h \
|
2018-03-17 01:42:52 +00:00
|
|
|
solaris/SolarisProcess.h \
|
|
|
|
solaris/SolarisProcessList.h \
|
2019-07-08 02:43:39 +00:00
|
|
|
zfs/ZfsArcMeter.h \
|
2021-03-02 23:59:28 +00:00
|
|
|
zfs/ZfsArcStats.h \
|
|
|
|
zfs/ZfsCompressedArcMeter.h
|
2018-03-17 01:42:52 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
solaris_platform_sources = \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
generic/hostname.c \
|
|
|
|
generic/uname.c \
|
|
|
|
solaris/Platform.c \
|
|
|
|
solaris/SolarisProcess.c \
|
|
|
|
solaris/SolarisProcessList.c \
|
|
|
|
zfs/ZfsArcMeter.c \
|
|
|
|
zfs/ZfsCompressedArcMeter.c
|
2018-03-02 21:20:46 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
if HTOP_SOLARIS
|
2018-03-17 01:42:52 +00:00
|
|
|
myhtopplatheaders = $(solaris_platform_headers)
|
2021-03-02 23:59:28 +00:00
|
|
|
myhtopplatsources = $(solaris_platform_sources)
|
2018-03-02 21:20:46 +00:00
|
|
|
endif
|
|
|
|
|
Add a platform for Performance Co-Pilot (PCP) metrics
This introduces an initial platform for extracting metrics
using the PCP performance metrics API - PMAPI(3). It can
be used via the --enable-pcp=yes configure option.
So far I've added support for live localhost metrics only,
and only using pre-defined metrics already found in htop.
If available, all sampling is performed by pmcd(1) - else,
we fallback to htop doing the metric sampling itself (all
below the PMAPI). When pmcd is used, it may be configured
to run children with elevated privileges, so htop does not
need to be setuid (authentication with pmcd is available).
Additionally, the PMAPI allows us to support archives (for
historical analysis and for automated regression tests in
htop). We'll need platform-specific command line argument
additions, which isn't yet feasible in htop (not difficult
to add though).
The goal of this first version is minimal impact in terms
of modifying the htop codebase, to introduce key ideas in
PCP (metric namespace, metadata, APIs and so on) and give
us something to discuss, experiment with and build on.
2021-02-17 03:43:56 +00:00
|
|
|
# Performance Co-Pilot (PCP)
|
|
|
|
# --------------------------
|
|
|
|
|
|
|
|
pcp_platform_headers = \
|
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
|
|
|
linux/PressureStallMeter.h \
|
|
|
|
linux/ZramMeter.h \
|
|
|
|
linux/ZramStats.h \
|
|
|
|
pcp/PCPDynamicColumn.h \
|
2021-06-23 07:44:56 +00:00
|
|
|
pcp/PCPDynamicMeter.h \
|
2021-08-14 21:30:19 +00:00
|
|
|
pcp/PCPMetric.h \
|
Add a platform for Performance Co-Pilot (PCP) metrics
This introduces an initial platform for extracting metrics
using the PCP performance metrics API - PMAPI(3). It can
be used via the --enable-pcp=yes configure option.
So far I've added support for live localhost metrics only,
and only using pre-defined metrics already found in htop.
If available, all sampling is performed by pmcd(1) - else,
we fallback to htop doing the metric sampling itself (all
below the PMAPI). When pmcd is used, it may be configured
to run children with elevated privileges, so htop does not
need to be setuid (authentication with pmcd is available).
Additionally, the PMAPI allows us to support archives (for
historical analysis and for automated regression tests in
htop). We'll need platform-specific command line argument
additions, which isn't yet feasible in htop (not difficult
to add though).
The goal of this first version is minimal impact in terms
of modifying the htop codebase, to introduce key ideas in
PCP (metric namespace, metadata, APIs and so on) and give
us something to discuss, experiment with and build on.
2021-02-17 03:43:56 +00:00
|
|
|
pcp/PCPProcess.h \
|
|
|
|
pcp/PCPProcessList.h \
|
|
|
|
pcp/Platform.h \
|
|
|
|
pcp/ProcessField.h \
|
2021-02-22 05:45:44 +00:00
|
|
|
zfs/ZfsArcMeter.h \
|
|
|
|
zfs/ZfsArcStats.h \
|
|
|
|
zfs/ZfsCompressedArcMeter.h
|
Add a platform for Performance Co-Pilot (PCP) metrics
This introduces an initial platform for extracting metrics
using the PCP performance metrics API - PMAPI(3). It can
be used via the --enable-pcp=yes configure option.
So far I've added support for live localhost metrics only,
and only using pre-defined metrics already found in htop.
If available, all sampling is performed by pmcd(1) - else,
we fallback to htop doing the metric sampling itself (all
below the PMAPI). When pmcd is used, it may be configured
to run children with elevated privileges, so htop does not
need to be setuid (authentication with pmcd is available).
Additionally, the PMAPI allows us to support archives (for
historical analysis and for automated regression tests in
htop). We'll need platform-specific command line argument
additions, which isn't yet feasible in htop (not difficult
to add though).
The goal of this first version is minimal impact in terms
of modifying the htop codebase, to introduce key ideas in
PCP (metric namespace, metadata, APIs and so on) and give
us something to discuss, experiment with and build on.
2021-02-17 03:43:56 +00:00
|
|
|
|
2021-03-25 06:24:14 +00:00
|
|
|
pcp_platform_sources = \
|
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
|
|
|
linux/PressureStallMeter.c \
|
|
|
|
linux/ZramMeter.c \
|
|
|
|
pcp/PCPDynamicColumn.c \
|
2021-06-23 07:44:56 +00:00
|
|
|
pcp/PCPDynamicMeter.c \
|
2021-08-14 21:30:19 +00:00
|
|
|
pcp/PCPMetric.c \
|
Add a platform for Performance Co-Pilot (PCP) metrics
This introduces an initial platform for extracting metrics
using the PCP performance metrics API - PMAPI(3). It can
be used via the --enable-pcp=yes configure option.
So far I've added support for live localhost metrics only,
and only using pre-defined metrics already found in htop.
If available, all sampling is performed by pmcd(1) - else,
we fallback to htop doing the metric sampling itself (all
below the PMAPI). When pmcd is used, it may be configured
to run children with elevated privileges, so htop does not
need to be setuid (authentication with pmcd is available).
Additionally, the PMAPI allows us to support archives (for
historical analysis and for automated regression tests in
htop). We'll need platform-specific command line argument
additions, which isn't yet feasible in htop (not difficult
to add though).
The goal of this first version is minimal impact in terms
of modifying the htop codebase, to introduce key ideas in
PCP (metric namespace, metadata, APIs and so on) and give
us something to discuss, experiment with and build on.
2021-02-17 03:43:56 +00:00
|
|
|
pcp/PCPProcess.c \
|
|
|
|
pcp/PCPProcessList.c \
|
|
|
|
pcp/Platform.c \
|
2021-02-22 05:45:44 +00:00
|
|
|
zfs/ZfsArcMeter.c \
|
|
|
|
zfs/ZfsCompressedArcMeter.c
|
Add a platform for Performance Co-Pilot (PCP) metrics
This introduces an initial platform for extracting metrics
using the PCP performance metrics API - PMAPI(3). It can
be used via the --enable-pcp=yes configure option.
So far I've added support for live localhost metrics only,
and only using pre-defined metrics already found in htop.
If available, all sampling is performed by pmcd(1) - else,
we fallback to htop doing the metric sampling itself (all
below the PMAPI). When pmcd is used, it may be configured
to run children with elevated privileges, so htop does not
need to be setuid (authentication with pmcd is available).
Additionally, the PMAPI allows us to support archives (for
historical analysis and for automated regression tests in
htop). We'll need platform-specific command line argument
additions, which isn't yet feasible in htop (not difficult
to add though).
The goal of this first version is minimal impact in terms
of modifying the htop codebase, to introduce key ideas in
PCP (metric namespace, metadata, APIs and so on) and give
us something to discuss, experiment with and build on.
2021-02-17 03:43:56 +00:00
|
|
|
|
2021-03-25 06:24:14 +00:00
|
|
|
if HTOP_PCP
|
Add a platform for Performance Co-Pilot (PCP) metrics
This introduces an initial platform for extracting metrics
using the PCP performance metrics API - PMAPI(3). It can
be used via the --enable-pcp=yes configure option.
So far I've added support for live localhost metrics only,
and only using pre-defined metrics already found in htop.
If available, all sampling is performed by pmcd(1) - else,
we fallback to htop doing the metric sampling itself (all
below the PMAPI). When pmcd is used, it may be configured
to run children with elevated privileges, so htop does not
need to be setuid (authentication with pmcd is available).
Additionally, the PMAPI allows us to support archives (for
historical analysis and for automated regression tests in
htop). We'll need platform-specific command line argument
additions, which isn't yet feasible in htop (not difficult
to add though).
The goal of this first version is minimal impact in terms
of modifying the htop codebase, to introduce key ideas in
PCP (metric namespace, metadata, APIs and so on) and give
us something to discuss, experiment with and build on.
2021-02-17 03:43:56 +00:00
|
|
|
myhtopplatheaders = $(pcp_platform_headers)
|
2021-03-25 06:24:14 +00:00
|
|
|
myhtopplatsources = $(pcp_platform_sources)
|
2021-09-23 00:06:38 +00:00
|
|
|
pcp_htop_SOURCES = $(myhtopplatprogram) $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
|
Add a platform for Performance Co-Pilot (PCP) metrics
This introduces an initial platform for extracting metrics
using the PCP performance metrics API - PMAPI(3). It can
be used via the --enable-pcp=yes configure option.
So far I've added support for live localhost metrics only,
and only using pre-defined metrics already found in htop.
If available, all sampling is performed by pmcd(1) - else,
we fallback to htop doing the metric sampling itself (all
below the PMAPI). When pmcd is used, it may be configured
to run children with elevated privileges, so htop does not
need to be setuid (authentication with pmcd is available).
Additionally, the PMAPI allows us to support archives (for
historical analysis and for automated regression tests in
htop). We'll need platform-specific command line argument
additions, which isn't yet feasible in htop (not difficult
to add though).
The goal of this first version is minimal impact in terms
of modifying the htop codebase, to introduce key ideas in
PCP (metric namespace, metadata, APIs and so on) and give
us something to discuss, experiment with and build on.
2021-02-17 03:43:56 +00:00
|
|
|
endif
|
|
|
|
|
2018-03-17 01:42:52 +00:00
|
|
|
# Unsupported
|
|
|
|
# -----------
|
|
|
|
|
|
|
|
unsupported_platform_headers = \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.h \
|
2018-03-17 01:42:52 +00:00
|
|
|
unsupported/Platform.h \
|
2020-12-15 18:44:48 +00:00
|
|
|
unsupported/ProcessField.h \
|
2018-03-17 01:42:52 +00:00
|
|
|
unsupported/UnsupportedProcess.h \
|
2020-11-17 07:12:38 +00:00
|
|
|
unsupported/UnsupportedProcessList.h
|
2018-03-17 01:42:52 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
unsupported_platform_sources = \
|
2021-03-30 04:55:48 +00:00
|
|
|
generic/gettime.c \
|
2021-03-02 23:59:28 +00:00
|
|
|
unsupported/Platform.c \
|
|
|
|
unsupported/UnsupportedProcess.c \
|
|
|
|
unsupported/UnsupportedProcessList.c
|
2014-11-24 20:55:03 +00:00
|
|
|
|
2021-03-02 23:59:28 +00:00
|
|
|
if HTOP_UNSUPPORTED
|
|
|
|
myhtopplatsources = $(unsupported_platform_sources)
|
2018-03-17 01:42:52 +00:00
|
|
|
myhtopplatheaders = $(unsupported_platform_headers)
|
2014-11-24 20:55:03 +00:00
|
|
|
endif
|
2007-05-21 19:09:19 +00:00
|
|
|
|
2018-03-17 01:42:52 +00:00
|
|
|
# ----
|
|
|
|
|
2021-09-23 00:06:38 +00:00
|
|
|
htop_SOURCES = $(myhtopplatprogram) $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
|
2020-08-25 09:38:14 +00:00
|
|
|
nodist_htop_SOURCES = config.h
|
2014-11-24 20:55:03 +00:00
|
|
|
|
|
|
|
target:
|
|
|
|
echo $(htop_SOURCES)
|
2011-09-24 00:30:47 +00:00
|
|
|
|
2006-07-11 06:13:32 +00:00
|
|
|
profile:
|
2020-11-21 21:31:10 +00:00
|
|
|
$(MAKE) all AM_CPPFLAGS="-pg -O2 -DNDEBUG"
|
2006-07-11 06:13:32 +00:00
|
|
|
|
2006-03-24 03:39:04 +00:00
|
|
|
debug:
|
2021-08-01 22:43:10 +00:00
|
|
|
$(MAKE) all AM_CPPFLAGS="-ggdb3 -Og" CFLAGS="`printf ' %s ' "$(CFLAGS)"|sed -E 's#[[:space:]]-O[^[:space:]]+[[:space:]]# #g'` -ggdb3 -Og"
|
2006-11-08 21:46:40 +00:00
|
|
|
|
2015-03-25 20:14:40 +00:00
|
|
|
coverage:
|
2021-02-16 16:07:08 +00:00
|
|
|
$(MAKE) all AM_CPPFLAGS="-fprofile-arcs -ftest-coverage" AM_LDFLAGS="-lgcov"
|
2015-03-25 20:14:40 +00:00
|
|
|
|
2011-10-25 00:46:37 +00:00
|
|
|
cppcheck:
|
2020-09-21 10:40:45 +00:00
|
|
|
cppcheck -q -v . --enable=all -DHAVE_OPENVZ
|
2014-11-24 20:55:03 +00:00
|
|
|
|
2018-04-06 15:47:55 +00:00
|
|
|
dist-hook: $(top_distdir)/configure
|
|
|
|
@if grep 'pkg_m4_absent' '$(top_distdir)/configure'; then \
|
|
|
|
echo 'configure is generated without pkg.m4. Please supply pkg.m4 and run ./autogen.sh to rebuild the configure script.'>&2; \
|
|
|
|
(exit 1); \
|
|
|
|
else :; \
|
|
|
|
fi
|
|
|
|
|
2015-03-25 20:14:40 +00:00
|
|
|
.PHONY: lcov
|
|
|
|
|
|
|
|
lcov:
|
|
|
|
mkdir -p lcov
|
|
|
|
lcov --capture --directory . --output-file coverage.info
|
|
|
|
genhtml coverage.info --output-directory lcov
|