zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
htop/Makefile.am

455 lines
9.5 KiB
Makefile
Raw Normal View History

Initial import.
2006-03-04 18:16:49 +00:00
dist_man_MANS = htop.1
configure: misc modernizations - require autoconf version 2.69 was released in 2012 and one still can configure and build on older systems (just not generate the configure script) - use modern C99 compiler check - drop obsolete checks: AC_C_CONST, AC_FUNC_CLOSEDIR_VOID, AC_FUNC_STAT - drop AC_HEADER_STDBOOL in favor of C99 compatibility
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
Initial import.
2006-03-04 18:16:49 +00:00
applicationsdir = $(datadir)/applications
applications_DATA = htop.desktop
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = htop.png
Update htop logo, provide .svg file as well
2020-11-30 15:17:09 +00:00
appicondir = $(datadir)/icons/hicolor/scalable/apps
appicon_DATA = htop.svg
Initial import.
2006-03-04 18:16:49 +00:00
Quote SYSCONFDIR definition As SYSCONFDIR is a compile time string literal, use compile time string concatenation instead of a runtime one. Also drop related TODO, cause we indeed using the correct way of getting $sysconfdir from autoconf
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)"
Use AM_CFLAGS and AM_LDFLAGS in Makefile.am (#760) This reduces generated Makefile.in size by 74%. (217319 bytes -> 56326 bytes) Automake considers that <prog>_CFLAGS and <prog>_LDFLAGS are program-specific build rules, and when such are specified, Automake will generate additional code just to avoid the "generic" and package-wide AM_CFLAGS or AM_LDFLAGS. (Especially for <prog>_CFLAGS, Automake will rename generated object files to become "prog-foo.o" and such, and it's _a lot_ of code to achieve this in Makefile.) There's no reason for htop to rename intermediate object files. It's better to make things simpler. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-16 14:31:48 +00:00
AM_LDFLAGS =
Initial import.
2006-03-04 18:16:49 +00:00
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
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 \
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
CommandLine.c \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
CommandScreen.c \
Add compat wrapper for fstatat
2020-10-26 20:16:43 +00:00
Compat.c \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
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 \
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 07:44:56 +00:00
DynamicMeter.c \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
EnvScreen.c \
FunctionBar.c \
Hashtable.c \
Header.c \
HostnameMeter.c \
IncSet.c \
InfoScreen.c \
ListItem.c \
LoadAverageMeter.c \
MainPanel.c \
MemoryMeter.c \
Add combined memory and swap meter Closes: #699
2021-08-10 19:32:05 +00:00
MemorySwapMeter.c \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
Meter.c \
MetersPanel.c \
Add NetworkIOMeter
2020-10-08 14:34:54 +00:00
NetworkIOMeter.c \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
Object.c \
OpenFilesScreen.c \
Add support to change numeric options in settings screen Like delay or highlightDelaySecs
2020-11-21 20:40:08 +00:00
OptionItem.c \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
Panel.c \
Process.c \
ProcessList.c \
Split platform dependent parts for file locks screen
2020-11-11 21:15:35 +00:00
ProcessLocksScreen.c \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
RichString.c \
ScreenManager.c \
Settings.c \
SignalsPanel.c \
SwapMeter.c \
[#480] SysArchMeter to view kernel/arch info At start, SysArchMeter calls the uname function to obtain the kernel version and architecture. If available, the distro version is obtained by calling lsb_release. The obtained values are stored in static variables and used when updating the meter.
2021-01-27 09:45:48 +00:00
SysArchMeter.c \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
TasksMeter.c \
TraceScreen.c \
UptimeMeter.c \
UsersTable.c \
Vector.c \
Rename StringUtils.[ch] to XUtils.[ch]
2020-10-14 18:21:09 +00:00
XUtils.c
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
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 \
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
CommandLine.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
CommandScreen.h \
Add compat wrapper for fstatat
2020-10-26 20:16:43 +00:00
Compat.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
DateMeter.h \
DateTimeMeter.h \
Makefile sort correction
2020-10-08 14:20:34 +00:00
DiskIOMeter.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
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 \
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 07:44:56 +00:00
DynamicMeter.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
EnvScreen.h \
FunctionBar.h \
Hashtable.h \
Header.h \
HostnameMeter.h \
IncSet.h \
InfoScreen.h \
ListItem.h \
LoadAverageMeter.h \
Macros.h \
MainPanel.h \
MemoryMeter.h \
Add combined memory and swap meter Closes: #699
2021-08-10 19:32:05 +00:00
MemorySwapMeter.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
Meter.h \
MetersPanel.h \
Add NetworkIOMeter
2020-10-08 14:34:54 +00:00
NetworkIOMeter.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
Object.h \
OpenFilesScreen.h \
Add support to change numeric options in settings screen Like delay or highlightDelaySecs
2020-11-21 20:40:08 +00:00
OptionItem.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
Panel.h \
Process.h \
ProcessList.h \
Split platform dependent parts for file locks screen
2020-11-11 21:15:35 +00:00
ProcessLocksScreen.h \
Make all required includes explicit Information as seen by IWYU 0.12 + clang 9 on Linux
2020-09-19 11:55:23 +00:00
ProvideCurses.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
RichString.h \
ScreenManager.h \
Settings.h \
SignalsPanel.h \
SwapMeter.h \
[#480] SysArchMeter to view kernel/arch info At start, SysArchMeter calls the uname function to obtain the kernel version and architecture. If available, the distro version is obtained by calling lsb_release. The obtained values are stored in static variables and used when updating the meter.
2021-01-27 09:45:48 +00:00
SysArchMeter.h \
Add a date and datetime meter (#159) Add a date meter and sort header and source files in Makefile Change the lists of header and source files sorted alphabetical and one file per line. This way diffs become better readable and merges easier.
2020-10-05 11:52:58 +00:00
TasksMeter.h \
TraceScreen.h \
UptimeMeter.h \
UsersTable.h \
Vector.h \
Rename StringUtils.[ch] to XUtils.[ch]
2020-10-14 18:21:09 +00:00
XUtils.h
Changes for supporting separate platform subdirectories.
2014-11-24 20:55:03 +00:00
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
# Linux
# -----
linux_platform_headers = \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.h \
generic/uname.h \
Linux: handle hugepages Subtract hugepages from normal memory. Add a HugePageMeter. Closes: #447
2021-01-05 14:50:23 +00:00
linux/HugePageMeter.h \
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
linux/IOPriority.h \
Add SELinuxMeter
2020-10-07 15:18:02 +00:00
linux/IOPriorityPanel.h \
Dynamically load libsensors at runtime
2020-12-01 12:59:19 +00:00
linux/LibSensors.h \
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
linux/LinuxProcess.h \
linux/LinuxProcessList.h \
Add SELinuxMeter
2020-10-07 15:18:02 +00:00
linux/Platform.h \
Merge branch 'hishamhm-pull-920'
2020-08-20 08:24:35 +00:00
linux/PressureStallMeter.h \
Rework enum ProcessField Use only one enum instead of a global and a platform specific one. Drop Platform_numberOfFields global variable. Set known size of Process_fields array
2020-12-15 18:44:48 +00:00
linux/ProcessField.h \
Add SELinuxMeter
2020-10-07 15:18:02 +00:00
linux/SELinuxMeter.h \
Add SystemdMeter
2020-10-07 13:42:13 +00:00
linux/SystemdMeter.h \
Zram Meter feature
2020-09-22 11:54:15 +00:00
linux/ZramMeter.h \
linux/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
zfs/ZfsArcMeter.h \
Add SELinuxMeter
2020-10-07 15:18:02 +00:00
zfs/ZfsArcStats.h \
zfs/ZfsCompressedArcMeter.h
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
linux_platform_sources = \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.c \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.c \
generic/uname.c \
Linux: handle hugepages Subtract hugepages from normal memory. Add a HugePageMeter. Closes: #447
2021-01-05 14:50:23 +00:00
linux/HugePageMeter.c \
Add SELinuxMeter
2020-10-07 15:18:02 +00:00
linux/IOPriorityPanel.c \
Dynamically load libsensors at runtime
2020-12-01 12:59:19 +00:00
linux/LibSensors.c \
Add SELinuxMeter
2020-10-07 15:18:02 +00:00
linux/LinuxProcess.c \
linux/LinuxProcessList.c \
linux/Platform.c \
linux/PressureStallMeter.c \
linux/SELinuxMeter.c \
Add SystemdMeter
2020-10-07 13:42:13 +00:00
linux/SystemdMeter.c \
Zram Meter feature
2020-09-22 11:54:15 +00:00
linux/ZramMeter.c \
Add SELinuxMeter
2020-10-07 15:18:02 +00:00
zfs/ZfsArcMeter.c \
zfs/ZfsCompressedArcMeter.c
Changes for supporting separate platform subdirectories.
2014-11-24 20:55:03 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
if HTOP_LINUX
AM_LDFLAGS += -rdynamic
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
myhtopplatprogram = htop
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
myhtopplatheaders = $(linux_platform_headers)
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
myhtopplatsources = $(linux_platform_sources)
Changes for supporting separate platform subdirectories.
2014-11-24 20:55:03 +00:00
endif
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
# FreeBSD
# -------
freebsd_platform_headers = \
freebsd/FreeBSDProcessList.h \
freebsd/FreeBSDProcess.h \
Rework enum ProcessField Use only one enum instead of a global and a platform specific one. Drop Platform_numberOfFields global variable. Set known size of Process_fields array
2020-12-15 18:44:48 +00:00
freebsd/Platform.h \
freebsd/ProcessField.h \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.h \
generic/openzfs_sysctl.h \
generic/uname.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
zfs/ZfsArcMeter.h \
zfs/ZfsArcStats.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
zfs/ZfsCompressedArcMeter.h
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
freebsd_platform_sources = \
freebsd/Platform.c \
freebsd/FreeBSDProcessList.c \
freebsd/FreeBSDProcess.c \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.c \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.c \
generic/openzfs_sysctl.c \
generic/uname.c \
zfs/ZfsArcMeter.c \
zfs/ZfsCompressedArcMeter.c
Beginnings of FreeBSD port!
2014-11-27 18:27:34 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
if HTOP_FREEBSD
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
myhtopplatprogram = htop
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
myhtopplatheaders = $(freebsd_platform_headers)
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
myhtopplatsources = $(freebsd_platform_sources)
Beginnings of FreeBSD port!
2014-11-27 18:27:34 +00:00
endif
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
# DragonFlyBSD
# ------------
dragonflybsd_platform_headers = \
dragonflybsd/DragonFlyBSDProcessList.h \
Rework enum ProcessField Use only one enum instead of a global and a platform specific one. Drop Platform_numberOfFields global variable. Set known size of Process_fields array
2020-12-15 18:44:48 +00:00
dragonflybsd/DragonFlyBSDProcess.h \
dragonflybsd/Platform.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
dragonflybsd/ProcessField.h \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.h \
generic/uname.h
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
dragonflybsd_platform_sources = \
DragonFlyBSD update - drop unused kinfo includes and link argument - detect kvm library necessity at configure step - fix variable typo
2020-12-20 17:21:25 +00:00
dragonflybsd/DragonFlyBSDProcessList.c \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
dragonflybsd/DragonFlyBSDProcess.c \
dragonflybsd/Platform.c \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.c \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.c \
generic/uname.c
Initial addition of dragonflybsd (based on FreeBSD)
2017-04-19 14:12:17 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
if HTOP_DRAGONFLYBSD
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
myhtopplatprogram = htop
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
myhtopplatheaders = $(dragonflybsd_platform_headers)
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
myhtopplatsources = $(dragonflybsd_platform_sources)
Initial addition of dragonflybsd (based on FreeBSD)
2017-04-19 14:12:17 +00:00
endif
Add NetBSD platform support without procfs dependency - TODO, clean up the code base and update comments in code.
2021-03-15 07:44:39 +00:00
# NetBSD
# -------
netbsd_platform_headers = \
Sync changes from master and fix minor warnings
2021-04-09 02:18:52 +00:00
generic/gettime.h \
generic/hostname.h \
generic/uname.h \
Add NetBSD platform support without procfs dependency - TODO, clean up the code base and update comments in code.
2021-03-15 07:44:39 +00:00
netbsd/Platform.h \
netbsd/ProcessField.h \
netbsd/NetBSDProcess.h \
Sync changes from master and fix minor warnings
2021-04-09 02:18:52 +00:00
netbsd/NetBSDProcessList.h
Add NetBSD platform support without procfs dependency - TODO, clean up the code base and update comments in code.
2021-03-15 07:44:39 +00:00
netbsd_platform_sources = \
Sync changes from master and fix minor warnings
2021-04-09 02:18:52 +00:00
generic/gettime.c \
generic/hostname.c \
generic/uname.c \
Add NetBSD platform support without procfs dependency - TODO, clean up the code base and update comments in code.
2021-03-15 07:44:39 +00:00
netbsd/Platform.c \
netbsd/NetBSDProcess.c \
Sync changes from master and fix minor warnings
2021-04-09 02:18:52 +00:00
netbsd/NetBSDProcessList.c
Add NetBSD platform support without procfs dependency - TODO, clean up the code base and update comments in code.
2021-03-15 07:44:39 +00:00
if HTOP_NETBSD
Sync changes from master and fix minor warnings
2021-04-09 02:18:52 +00:00
myhtopplatprogram = htop
Add NetBSD platform support without procfs dependency - TODO, clean up the code base and update comments in code.
2021-03-15 07:44:39 +00:00
myhtopplatheaders = $(netbsd_platform_headers)
myhtopplatsources = $(netbsd_platform_sources)
endif
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
# OpenBSD
# -------
openbsd_platform_headers = \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.h \
generic/uname.h \
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
openbsd/OpenBSDProcessList.h \
Rework enum ProcessField Use only one enum instead of a global and a platform specific one. Drop Platform_numberOfFields global variable. Set known size of Process_fields array
2020-12-15 18:44:48 +00:00
openbsd/OpenBSDProcess.h \
openbsd/Platform.h \
openbsd/ProcessField.h
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
openbsd_platform_sources = \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.c \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.c \
generic/uname.c \
openbsd/OpenBSDProcessList.c \
openbsd/OpenBSDProcess.c \
openbsd/Platform.c
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
if HTOP_OPENBSD
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
myhtopplatprogram = htop
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
myhtopplatheaders = $(openbsd_platform_headers)
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
myhtopplatsources = $(openbsd_platform_sources)
(Very) initial working OpenBSD port
2015-09-18 04:46:48 +00:00
endif
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
# Darwin
# ------
darwin_platform_headers = \
darwin/DarwinProcess.h \
darwin/DarwinProcessList.h \
Rework enum ProcessField Use only one enum instead of a global and a platform specific one. Drop Platform_numberOfFields global variable. Set known size of Process_fields array
2020-12-15 18:44:48 +00:00
darwin/Platform.h \
darwin/ProcessField.h \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.h \
generic/openzfs_sysctl.h \
generic/uname.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
zfs/ZfsArcMeter.h \
zfs/ZfsArcStats.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
zfs/ZfsCompressedArcMeter.h
darwin_platform_sources = \
darwin/Platform.c \
darwin/DarwinProcess.c \
darwin/DarwinProcessList.c \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.c \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.c \
generic/openzfs_sysctl.c \
generic/uname.c \
zfs/ZfsArcMeter.c \
zfs/ZfsCompressedArcMeter.c
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
Added darwin with working battery meter
2015-07-12 18:47:43 +00:00
if HTOP_DARWIN
Use AM_CFLAGS and AM_LDFLAGS in Makefile.am (#760) This reduces generated Makefile.in size by 74%. (217319 bytes -> 56326 bytes) Automake considers that <prog>_CFLAGS and <prog>_LDFLAGS are program-specific build rules, and when such are specified, Automake will generate additional code just to avoid the "generic" and package-wide AM_CFLAGS or AM_LDFLAGS. (Especially for <prog>_CFLAGS, Automake will rename generated object files to become "prog-foo.o" and such, and it's _a lot_ of code to achieve this in Makefile.) There's no reason for htop to rename intermediate object files. It's better to make things simpler. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-16 14:31:48 +00:00
AM_LDFLAGS += -framework IOKit -framework CoreFoundation
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
myhtopplatprogram = htop
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
myhtopplatheaders = $(darwin_platform_headers)
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
myhtopplatsources = $(darwin_platform_sources)
Added darwin with working battery meter
2015-07-12 18:47:43 +00:00
endif
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
# Solaris
# -------
solaris_platform_headers = \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
generic/hostname.h \
generic/uname.h \
Rework enum ProcessField Use only one enum instead of a global and a platform specific one. Drop Platform_numberOfFields global variable. Set known size of Process_fields array
2020-12-15 18:44:48 +00:00
solaris/ProcessField.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
solaris/Platform.h \
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
solaris/SolarisProcess.h \
solaris/SolarisProcessList.h \
ZFS arcstats for Solaris
2019-07-08 02:43:39 +00:00
zfs/ZfsArcMeter.h \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
zfs/ZfsArcStats.h \
zfs/ZfsCompressedArcMeter.h
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
solaris_platform_sources = \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.c \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
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
Import Solaris support (#741) This commit adds support for Solaris, squashed from PR #741: Summary of additions: * Initial setup of Solaris platform directory * Add Solaris platform into autoconf template * Uptime and load averages * Add dependency on libkstat * Basic process listing * Zone name display * CPU detection * Per-process memory and CPU usage parsed correctly * Uses sysconf to discover number of CPUs, instead of more complex libkstat code * Simple memory display working * Reduce repetitive calls to the PAGE_SIZE macro when reading memory info * Add Project, Contract, Task, and Pool into process properties * Use system major()/minor() implementations and remove extraneous definition of mkdev() * Get the STARTTIME column working properly, using the Linux implementation as a guide
2018-03-02 21:20:46 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
if HTOP_SOLARIS
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
myhtopplatprogram = htop
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
myhtopplatheaders = $(solaris_platform_headers)
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
myhtopplatsources = $(solaris_platform_sources)
Import Solaris support (#741) This commit adds support for Solaris, squashed from PR #741: Summary of additions: * Initial setup of Solaris platform directory * Add Solaris platform into autoconf template * Uptime and load averages * Add dependency on libkstat * Basic process listing * Zone name display * CPU detection * Per-process memory and CPU usage parsed correctly * Uses sysconf to discover number of CPUs, instead of more complex libkstat code * Simple memory display working * Reduce repetitive calls to the PAGE_SIZE macro when reading memory info * Add Project, Contract, Task, and Pool into process properties * Use system major()/minor() implementations and remove extraneous definition of mkdev() * Get the STARTTIME column working properly, using the Linux implementation as a guide
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 \
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 07:44:56 +00:00
pcp/PCPDynamicMeter.h \
PCP: PCPMetric.[ch] Mdoule Split the PCP Metric API (functions `Metric_*`) into their own module. as @BenBE suggested.
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 \
Add ZFS ARC statistics and meters to the PCP platform
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
Implement command line and environment handling for pcp htop.
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 \
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 07:44:56 +00:00
pcp/PCPDynamicMeter.c \
PCP: PCPMetric.[ch] Mdoule Split the PCP Metric API (functions `Metric_*`) into their own module. as @BenBE suggested.
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 \
Add ZFS ARC statistics and meters to the PCP platform
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
Implement command line and environment handling for pcp htop.
2021-03-25 06:24:14 +00:00
if HTOP_PCP
myhtopplatprogram = pcp-htop
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)
Implement command line and environment handling for pcp htop.
2021-03-25 06:24:14 +00:00
myhtopplatsources = $(pcp_platform_sources)
Add time handling interfaces for the pcp platform Related to https://github.com/htop-dev/htop/pull/574
2021-04-08 00:13:43 +00:00
pcp_htop_SOURCES = $(myhtopplatprogram).c $(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
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
# Unsupported
# -----------
unsupported_platform_headers = \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.h \
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
unsupported/Platform.h \
Rework enum ProcessField Use only one enum instead of a global and a platform specific one. Drop Platform_numberOfFields global variable. Set known size of Process_fields array
2020-12-15 18:44:48 +00:00
unsupported/ProcessField.h \
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
unsupported/UnsupportedProcess.h \
Merge individual Battery.[ch] files into Platform.[ch] Consistent with everything else involving platform-specific calls from core htop code.
2020-11-17 07:12:38 +00:00
unsupported/UnsupportedProcessList.h
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
unsupported_platform_sources = \
Request the realtime and monotonic clock times once per sample Refactor the sample time code to make one call to gettimeofday (aka the realtime clock in clock_gettime, when available) and one to the monotonic clock. Stores each in more appropriately named ProcessList fields for ready access when needed. Every platform gets the opportunity to provide their own clock code, and the existing Mac OS X specific code is moved below darwin instead of in Compat. A couple of leftover time(2) calls are converted to use these ProcessList fields as well, instead of yet again sampling the system clock. Related to https://github.com/htop-dev/htop/pull/574
2021-03-30 04:55:48 +00:00
generic/gettime.c \
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
unsupported/Platform.c \
unsupported/UnsupportedProcess.c \
unsupported/UnsupportedProcessList.c
Changes for supporting separate platform subdirectories.
2014-11-24 20:55:03 +00:00
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
if HTOP_UNSUPPORTED
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
myhtopplatprogram = htop
Move generic (shared) code into its own sub-directory Code that is shared across some (but not all) platforms is moved into a 'generic' home. Makefile.am cleanups to match plus some minor alphabetic reordering/formatting. As discussed in https://github.com/htop-dev/htop/pull/553
2021-03-02 23:59:28 +00:00
myhtopplatsources = $(unsupported_platform_sources)
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
myhtopplatheaders = $(unsupported_platform_headers)
Changes for supporting separate platform subdirectories.
2014-11-24 20:55:03 +00:00
endif
Fix regeneration of headers
2007-05-21 19:09:19 +00:00
New makefile targets to rebuild and clean htop headers. `make htop-headers` will regenerate all '.h' headers in htop source for all platforms. `make clean-htop-headers` will delete all generated htop headers. Because of the introduction of these two targets, I slightly changed the style of platform-specific portions of makefile rules. Please comment if you accept such a style, or need me to revert to old style. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-03-17 01:42:52 +00:00
# ----
Abstract htop main function to allow for a platform binary One review request relating to the PCP platform is to have a clearly separate binary from the regular htop so that we have no confusion as to what is being requested to run, to aid debugging, and a bunch of other good reasons. This commit renames htop.c to CommandLine.c and provides a minimal htop main function for 'native' platforms to use. The PCP version of this will setup libpcp.so and then call the same CommandLine_run function as regular htop. Related to https://github.com/htop-dev/htop/pull/536
2021-03-23 04:04:54 +00:00
bin_PROGRAMS = $(myhtopplatprogram)
Add time handling interfaces for the pcp platform Related to https://github.com/htop-dev/htop/pull/574
2021-04-08 00:13:43 +00:00
htop_SOURCES = $(myhtopplatprogram).c $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
Do not include the generated `config.h` header into the package
2020-08-25 09:38:14 +00:00
nodist_htop_SOURCES = config.h
Changes for supporting separate platform subdirectories.
2014-11-24 20:55:03 +00:00
target:
echo $(htop_SOURCES)
Convert affinity control from the deprecated PLPA to HWLOC
2011-09-24 00:30:47 +00:00
Performance improvement hackathon: improve process comparison routines, disable useless code in release builds such as runtime type-checking on dynamic data structures and process fields that are not being computed, faster(?) method for verifying the process owner (still need to ensure correctness), don't destroy and create process objects for hidden kernel threads over and over. Phew. I shouldn't be doing all this today, but I could not resist.
2006-07-11 06:13:32 +00:00
profile:
Fix build for custom make targets
2020-11-21 21:31:10 +00:00
$(MAKE) all AM_CPPFLAGS="-pg -O2 -DNDEBUG"
Performance improvement hackathon: improve process comparison routines, disable useless code in release builds such as runtime type-checking on dynamic data structures and process fields that are not being computed, faster(?) method for verifying the process owner (still need to ensure correctness), don't destroy and create process objects for hidden kernel threads over and over. Phew. I shouldn't be doing all this today, but I could not resist.
2006-07-11 06:13:32 +00:00
* make debug target * Support for generating a /proc trace for debugging purposes.
2006-03-24 03:39:04 +00:00
debug:
Makefile.am fix that actually does a proper substitution
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"
Add an additional debug mode for Hardened GCC.
2006-11-08 21:46:40 +00:00
Add coverage testing rules
2015-03-25 20:14:40 +00:00
coverage:
Drop -DDEBUG (was removed in d69585b82abfdaede9e8c358982a4953c432e8d2), add -Og for make debug target
2021-02-16 16:07:08 +00:00
$(MAKE) all AM_CPPFLAGS="-fprofile-arcs -ftest-coverage" AM_LDFLAGS="-lgcov"
Add coverage testing rules
2015-03-25 20:14:40 +00:00
store cppcheck rule for future use
2011-10-25 00:46:37 +00:00
cppcheck:
Drop taskstats conditional taskstats is only checked on runtime if the column RCHAR, WCHAR, SYSCR, SYSCW, RBYTES, WBYTES, CNCLWB, IO_READ_RATE, IO_WRITE_RATE or IO_RATE is selected. taskstats is currently enabled by default. Drop the taskstats configuration switch, to reduce the maintenance cost.
2020-09-21 10:40:45 +00:00
cppcheck -q -v . --enable=all -DHAVE_OPENVZ
Changes for supporting separate platform subdirectories.
2014-11-24 20:55:03 +00:00
Disable 'make dist' when pkg.m4 is unused in configure This would prevent a careless future package maintainer from creating a release tarball with a defective configure script. :) Also, add a warning in the autogen.sh phase if pkg.m4 is unused. Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
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
Add coverage testing rules
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