Various code tidyups based on review commentary from BenBE

This commit is contained in:
Nathan Scott 2021-04-14 11:34:47 +10:00
parent b232119e4b
commit 9ce9557e69
5 changed files with 129 additions and 123 deletions

View File

@ -101,7 +101,7 @@ esac
AC_ARG_ENABLE([pcp], AC_ARG_ENABLE([pcp],
[AS_HELP_STRING([--enable-pcp], [AS_HELP_STRING([--enable-pcp],
[build a pcp htop binary @<:@default=no@:>@])], [build a pcp-htop binary @<:@default=no@:>@])],
[], [],
[enable_pcp=no]) [enable_pcp=no])
case "$enable_pcp" in case "$enable_pcp" in

View File

@ -9,7 +9,7 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.
*/ */
#include "config.h" #include "config.h" // IWYU pragma: keep
#include <stdbool.h> #include <stdbool.h>
#include <sys/types.h> #include <sys/types.h>
@ -19,6 +19,7 @@ in the source distribution for its full text.
#include "RichString.h" #include "RichString.h"
#include "Settings.h" #include "Settings.h"
#define PROCESS_FLAG_LINUX_CGROUP 0x0800 #define PROCESS_FLAG_LINUX_CGROUP 0x0800
#define PROCESS_FLAG_LINUX_OOM 0x1000 #define PROCESS_FLAG_LINUX_OOM 0x1000
#define PROCESS_FLAG_LINUX_SMAPS 0x2000 #define PROCESS_FLAG_LINUX_SMAPS 0x2000

View File

@ -7,17 +7,19 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.
*/ */
#include "config.h" #include "config.h" // IWYU pragma: keep
#include <stdbool.h> #include <stdbool.h>
#include <sys/types.h> #include <sys/types.h>
#include "Hashtable.h" #include "Hashtable.h"
#include "ProcessList.h" #include "ProcessList.h"
#include "pcp/Platform.h"
#include "UsersTable.h" #include "UsersTable.h"
#include "pcp/Platform.h"
#include "zfs/ZfsArcStats.h" #include "zfs/ZfsArcStats.h"
typedef enum CPUMetric_ { typedef enum CPUMetric_ {
CPU_TOTAL_TIME, CPU_TOTAL_TIME,
CPU_USER_TIME, CPU_USER_TIME,

View File

@ -7,7 +7,9 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.
*/ */
#include "config.h" #include "config.h" // IWYU pragma: keep
#include "Platform.h"
#include <math.h> #include <math.h>
@ -29,7 +31,6 @@ in the source distribution for its full text.
#include "Panel.h" #include "Panel.h"
#include "PCPProcess.h" #include "PCPProcess.h"
#include "PCPProcessList.h" #include "PCPProcessList.h"
#include "Platform.h"
#include "ProcessList.h" #include "ProcessList.h"
#include "ProvideCurses.h" #include "ProvideCurses.h"
#include "Settings.h" #include "Settings.h"
@ -38,6 +39,7 @@ in the source distribution for its full text.
#include "TasksMeter.h" #include "TasksMeter.h"
#include "UptimeMeter.h" #include "UptimeMeter.h"
#include "XUtils.h" #include "XUtils.h"
#include "linux/PressureStallMeter.h" #include "linux/PressureStallMeter.h"
#include "linux/ZramMeter.h" #include "linux/ZramMeter.h"
#include "linux/ZramStats.h" #include "linux/ZramStats.h"

View File

@ -13,6 +13,7 @@ in the source distribution for its full text.
#include <stdbool.h> #include <stdbool.h>
#include <pcp/pmapi.h> #include <pcp/pmapi.h>
/* use htop config.h values for these macros, not pcp values */
#undef PACKAGE_URL #undef PACKAGE_URL
#undef PACKAGE_NAME #undef PACKAGE_NAME
#undef PACKAGE_STRING #undef PACKAGE_STRING
@ -106,130 +107,130 @@ extern pmOptions opts;
typedef enum Metric_ { typedef enum Metric_ {
PCP_CONTROL_THREADS, /* proc.control.perclient.threads */ PCP_CONTROL_THREADS, /* proc.control.perclient.threads */
PCP_HINV_NCPU, /* hinv.ncpu */ PCP_HINV_NCPU, /* hinv.ncpu */
PCP_HINV_CPUCLOCK, /* hinv.cpu.clock */ PCP_HINV_CPUCLOCK, /* hinv.cpu.clock */
PCP_UNAME_SYSNAME, /* kernel.uname.sysname */ PCP_UNAME_SYSNAME, /* kernel.uname.sysname */
PCP_UNAME_RELEASE, /* kernel.uname.release */ PCP_UNAME_RELEASE, /* kernel.uname.release */
PCP_UNAME_MACHINE, /* kernel.uname.machine */ PCP_UNAME_MACHINE, /* kernel.uname.machine */
PCP_UNAME_DISTRO, /* kernel.uname.distro */ PCP_UNAME_DISTRO, /* kernel.uname.distro */
PCP_LOAD_AVERAGE, /* kernel.all.load */ PCP_LOAD_AVERAGE, /* kernel.all.load */
PCP_PID_MAX, /* kernel.all.pid_max */ PCP_PID_MAX, /* kernel.all.pid_max */
PCP_UPTIME, /* kernel.all.uptime */ PCP_UPTIME, /* kernel.all.uptime */
PCP_BOOTTIME, /* kernel.all.boottime */ PCP_BOOTTIME, /* kernel.all.boottime */
PCP_CPU_USER, /* kernel.all.cpu.user */ PCP_CPU_USER, /* kernel.all.cpu.user */
PCP_CPU_NICE, /* kernel.all.cpu.nice */ PCP_CPU_NICE, /* kernel.all.cpu.nice */
PCP_CPU_SYSTEM, /* kernel.all.cpu.sys */ PCP_CPU_SYSTEM, /* kernel.all.cpu.sys */
PCP_CPU_IDLE, /* kernel.all.cpu.idle */ PCP_CPU_IDLE, /* kernel.all.cpu.idle */
PCP_CPU_IOWAIT, /* kernel.all.cpu.wait.total */ PCP_CPU_IOWAIT, /* kernel.all.cpu.wait.total */
PCP_CPU_IRQ, /* kernel.all.cpu.intr */ PCP_CPU_IRQ, /* kernel.all.cpu.intr */
PCP_CPU_SOFTIRQ, /* kernel.all.cpu.irq.soft */ PCP_CPU_SOFTIRQ, /* kernel.all.cpu.irq.soft */
PCP_CPU_STEAL, /* kernel.all.cpu.steal */ PCP_CPU_STEAL, /* kernel.all.cpu.steal */
PCP_CPU_GUEST, /* kernel.all.cpu.guest */ PCP_CPU_GUEST, /* kernel.all.cpu.guest */
PCP_CPU_GUESTNICE, /* kernel.all.cpu.guest_nice */ PCP_CPU_GUESTNICE, /* kernel.all.cpu.guest_nice */
PCP_PERCPU_USER, /* kernel.percpu.cpu.user */ PCP_PERCPU_USER, /* kernel.percpu.cpu.user */
PCP_PERCPU_NICE, /* kernel.percpu.cpu.nice */ PCP_PERCPU_NICE, /* kernel.percpu.cpu.nice */
PCP_PERCPU_SYSTEM, /* kernel.percpu.cpu.sys */ PCP_PERCPU_SYSTEM, /* kernel.percpu.cpu.sys */
PCP_PERCPU_IDLE, /* kernel.percpu.cpu.idle */ PCP_PERCPU_IDLE, /* kernel.percpu.cpu.idle */
PCP_PERCPU_IOWAIT, /* kernel.percpu.cpu.wait.total */ PCP_PERCPU_IOWAIT, /* kernel.percpu.cpu.wait.total */
PCP_PERCPU_IRQ, /* kernel.percpu.cpu.intr */ PCP_PERCPU_IRQ, /* kernel.percpu.cpu.intr */
PCP_PERCPU_SOFTIRQ, /* kernel.percpu.cpu.irq.soft */ PCP_PERCPU_SOFTIRQ, /* kernel.percpu.cpu.irq.soft */
PCP_PERCPU_STEAL, /* kernel.percpu.cpu.steal */ PCP_PERCPU_STEAL, /* kernel.percpu.cpu.steal */
PCP_PERCPU_GUEST, /* kernel.percpu.cpu.guest */ PCP_PERCPU_GUEST, /* kernel.percpu.cpu.guest */
PCP_PERCPU_GUESTNICE, /* kernel.percpu.cpu.guest_nice */ PCP_PERCPU_GUESTNICE, /* kernel.percpu.cpu.guest_nice */
PCP_MEM_TOTAL, /* mem.physmem */ PCP_MEM_TOTAL, /* mem.physmem */
PCP_MEM_FREE, /* mem.util.free */ PCP_MEM_FREE, /* mem.util.free */
PCP_MEM_BUFFERS, /* mem.util.bufmem */ PCP_MEM_BUFFERS, /* mem.util.bufmem */
PCP_MEM_CACHED, /* mem.util.cached */ PCP_MEM_CACHED, /* mem.util.cached */
PCP_MEM_SHARED, /* mem.util.shared */ PCP_MEM_SHARED, /* mem.util.shared */
PCP_MEM_AVAILABLE, /* mem.util.available */ PCP_MEM_AVAILABLE, /* mem.util.available */
PCP_MEM_SRECLAIM, /* mem.util.slabReclaimable */ PCP_MEM_SRECLAIM, /* mem.util.slabReclaimable */
PCP_MEM_SWAPCACHED, /* mem.util.swapCached */ PCP_MEM_SWAPCACHED, /* mem.util.swapCached */
PCP_MEM_SWAPTOTAL, /* mem.util.swapTotal */ PCP_MEM_SWAPTOTAL, /* mem.util.swapTotal */
PCP_MEM_SWAPFREE, /* mem.util.swapFree */ PCP_MEM_SWAPFREE, /* mem.util.swapFree */
PCP_DISK_READB, /* disk.all.read_bytes */ PCP_DISK_READB, /* disk.all.read_bytes */
PCP_DISK_WRITEB, /* disk.all.write_bytes */ PCP_DISK_WRITEB, /* disk.all.write_bytes */
PCP_DISK_ACTIVE, /* disk.all.avactive */ PCP_DISK_ACTIVE, /* disk.all.avactive */
PCP_NET_RECVB, /* network.all.in.bytes */ PCP_NET_RECVB, /* network.all.in.bytes */
PCP_NET_SENDB, /* network.all.out.bytes */ PCP_NET_SENDB, /* network.all.out.bytes */
PCP_NET_RECVP, /* network.all.in.packets */ PCP_NET_RECVP, /* network.all.in.packets */
PCP_NET_SENDP, /* network.all.out.packets */ PCP_NET_SENDP, /* network.all.out.packets */
PCP_PSI_CPUSOME, /* kernel.all.pressure.cpu.some.avg */ PCP_PSI_CPUSOME, /* kernel.all.pressure.cpu.some.avg */
PCP_PSI_IOSOME, /* kernel.all.pressure.io.some.avg */ PCP_PSI_IOSOME, /* kernel.all.pressure.io.some.avg */
PCP_PSI_IOFULL, /* kernel.all.pressure.io.full.avg */ PCP_PSI_IOFULL, /* kernel.all.pressure.io.full.avg */
PCP_PSI_MEMSOME, /* kernel.all.pressure.memory.some.avg */ PCP_PSI_MEMSOME, /* kernel.all.pressure.memory.some.avg */
PCP_PSI_MEMFULL, /* kernel.all.pressure.memory.full.avg */ PCP_PSI_MEMFULL, /* kernel.all.pressure.memory.full.avg */
PCP_ZFS_ARC_ANON_SIZE, /* zfs.arc.anon_size */ PCP_ZFS_ARC_ANON_SIZE, /* zfs.arc.anon_size */
PCP_ZFS_ARC_BONUS_SIZE, /* zfs.arc.bonus_size */ PCP_ZFS_ARC_BONUS_SIZE, /* zfs.arc.bonus_size */
PCP_ZFS_ARC_COMPRESSED_SIZE, /* zfs.arc.compressed_size */ PCP_ZFS_ARC_COMPRESSED_SIZE, /* zfs.arc.compressed_size */
PCP_ZFS_ARC_UNCOMPRESSED_SIZE, /* zfs.arc.uncompressed_size */ PCP_ZFS_ARC_UNCOMPRESSED_SIZE, /* zfs.arc.uncompressed_size */
PCP_ZFS_ARC_C_MAX, /* zfs.arc.c_max */ PCP_ZFS_ARC_C_MAX, /* zfs.arc.c_max */
PCP_ZFS_ARC_DBUF_SIZE, /* zfs.arc.dbuf_size */ PCP_ZFS_ARC_DBUF_SIZE, /* zfs.arc.dbuf_size */
PCP_ZFS_ARC_DNODE_SIZE, /* zfs.arc.dnode_size */ PCP_ZFS_ARC_DNODE_SIZE, /* zfs.arc.dnode_size */
PCP_ZFS_ARC_HDR_SIZE, /* zfs.arc.hdr_size */ PCP_ZFS_ARC_HDR_SIZE, /* zfs.arc.hdr_size */
PCP_ZFS_ARC_MFU_SIZE, /* zfs.arc.mfu_size */ PCP_ZFS_ARC_MFU_SIZE, /* zfs.arc.mfu_size */
PCP_ZFS_ARC_MRU_SIZE, /* zfs.arc.mru_size */ PCP_ZFS_ARC_MRU_SIZE, /* zfs.arc.mru_size */
PCP_ZFS_ARC_SIZE, /* zfs.arc.size */ PCP_ZFS_ARC_SIZE, /* zfs.arc.size */
PCP_ZRAM_CAPACITY, /* zram.capacity */ PCP_ZRAM_CAPACITY, /* zram.capacity */
PCP_ZRAM_ORIGINAL, /* zram.mm_stat.data_size.original */ PCP_ZRAM_ORIGINAL, /* zram.mm_stat.data_size.original */
PCP_ZRAM_COMPRESSED, /* zram.mm_stat.data_size.compressed */ PCP_ZRAM_COMPRESSED, /* zram.mm_stat.data_size.compressed */
PCP_PROC_PID, /* proc.psinfo.pid */ PCP_PROC_PID, /* proc.psinfo.pid */
PCP_PROC_PPID, /* proc.psinfo.ppid */ PCP_PROC_PPID, /* proc.psinfo.ppid */
PCP_PROC_TGID, /* proc.psinfo.tgid */ PCP_PROC_TGID, /* proc.psinfo.tgid */
PCP_PROC_PGRP, /* proc.psinfo.pgrp */ PCP_PROC_PGRP, /* proc.psinfo.pgrp */
PCP_PROC_SESSION, /* proc.psinfo.session */ PCP_PROC_SESSION, /* proc.psinfo.session */
PCP_PROC_STATE, /* proc.psinfo.sname */ PCP_PROC_STATE, /* proc.psinfo.sname */
PCP_PROC_TTY, /* proc.psinfo.tty */ PCP_PROC_TTY, /* proc.psinfo.tty */
PCP_PROC_TTYPGRP, /* proc.psinfo.tty_pgrp */ PCP_PROC_TTYPGRP, /* proc.psinfo.tty_pgrp */
PCP_PROC_MINFLT, /* proc.psinfo.minflt */ PCP_PROC_MINFLT, /* proc.psinfo.minflt */
PCP_PROC_MAJFLT, /* proc.psinfo.maj_flt */ PCP_PROC_MAJFLT, /* proc.psinfo.maj_flt */
PCP_PROC_CMINFLT, /* proc.psinfo.cmin_flt */ PCP_PROC_CMINFLT, /* proc.psinfo.cmin_flt */
PCP_PROC_CMAJFLT, /* proc.psinfo.cmaj_flt */ PCP_PROC_CMAJFLT, /* proc.psinfo.cmaj_flt */
PCP_PROC_UTIME, /* proc.psinfo.utime */ PCP_PROC_UTIME, /* proc.psinfo.utime */
PCP_PROC_STIME, /* proc.psinfo.stime */ PCP_PROC_STIME, /* proc.psinfo.stime */
PCP_PROC_CUTIME, /* proc.psinfo.cutime */ PCP_PROC_CUTIME, /* proc.psinfo.cutime */
PCP_PROC_CSTIME, /* proc.psinfo.cstime */ PCP_PROC_CSTIME, /* proc.psinfo.cstime */
PCP_PROC_PRIORITY, /* proc.psinfo.priority */ PCP_PROC_PRIORITY, /* proc.psinfo.priority */
PCP_PROC_NICE, /* proc.psinfo.nice */ PCP_PROC_NICE, /* proc.psinfo.nice */
PCP_PROC_THREADS, /* proc.psinfo.threads */ PCP_PROC_THREADS, /* proc.psinfo.threads */
PCP_PROC_STARTTIME, /* proc.psinfo.start_time */ PCP_PROC_STARTTIME, /* proc.psinfo.start_time */
PCP_PROC_PROCESSOR, /* proc.psinfo.processor */ PCP_PROC_PROCESSOR, /* proc.psinfo.processor */
PCP_PROC_CMD, /* proc.psinfo.cmd */ PCP_PROC_CMD, /* proc.psinfo.cmd */
PCP_PROC_PSARGS, /* proc.psinfo.psargs */ PCP_PROC_PSARGS, /* proc.psinfo.psargs */
PCP_PROC_CGROUPS, /* proc.psinfo.cgroups */ PCP_PROC_CGROUPS, /* proc.psinfo.cgroups */
PCP_PROC_OOMSCORE, /* proc.psinfo.oom_score */ PCP_PROC_OOMSCORE, /* proc.psinfo.oom_score */
PCP_PROC_VCTXSW, /* proc.psinfo.vctxsw */ PCP_PROC_VCTXSW, /* proc.psinfo.vctxsw */
PCP_PROC_NVCTXSW, /* proc.psinfo.nvctxsw */ PCP_PROC_NVCTXSW, /* proc.psinfo.nvctxsw */
PCP_PROC_LABELS, /* proc.psinfo.labels */ PCP_PROC_LABELS, /* proc.psinfo.labels */
PCP_PROC_ENVIRON, /* proc.psinfo.environ */ PCP_PROC_ENVIRON, /* proc.psinfo.environ */
PCP_PROC_TTYNAME, /* proc.psinfo.ttyname */ PCP_PROC_TTYNAME, /* proc.psinfo.ttyname */
PCP_PROC_ID_UID, /* proc.id.uid */ PCP_PROC_ID_UID, /* proc.id.uid */
PCP_PROC_ID_USER, /* proc.id.uid_nm */ PCP_PROC_ID_USER, /* proc.id.uid_nm */
PCP_PROC_IO_RCHAR, /* proc.io.rchar */ PCP_PROC_IO_RCHAR, /* proc.io.rchar */
PCP_PROC_IO_WCHAR, /* proc.io.wchar */ PCP_PROC_IO_WCHAR, /* proc.io.wchar */
PCP_PROC_IO_SYSCR, /* proc.io.syscr */ PCP_PROC_IO_SYSCR, /* proc.io.syscr */
PCP_PROC_IO_SYSCW, /* proc.io.syscw */ PCP_PROC_IO_SYSCW, /* proc.io.syscw */
PCP_PROC_IO_READB, /* proc.io.read_bytes */ PCP_PROC_IO_READB, /* proc.io.read_bytes */
PCP_PROC_IO_WRITEB, /* proc.io.write_bytes */ PCP_PROC_IO_WRITEB, /* proc.io.write_bytes */
PCP_PROC_IO_CANCELLED, /* proc.io.cancelled_write_bytes */ PCP_PROC_IO_CANCELLED, /* proc.io.cancelled_write_bytes */
PCP_PROC_MEM_SIZE, /* proc.memory.size */ PCP_PROC_MEM_SIZE, /* proc.memory.size */
PCP_PROC_MEM_RSS, /* proc.memory.rss */ PCP_PROC_MEM_RSS, /* proc.memory.rss */
PCP_PROC_MEM_SHARE, /* proc.memory.share */ PCP_PROC_MEM_SHARE, /* proc.memory.share */
PCP_PROC_MEM_TEXTRS, /* proc.memory.textrss */ PCP_PROC_MEM_TEXTRS, /* proc.memory.textrss */
PCP_PROC_MEM_LIBRS, /* proc.memory.librss */ PCP_PROC_MEM_LIBRS, /* proc.memory.librss */
PCP_PROC_MEM_DATRS, /* proc.memory.datrss */ PCP_PROC_MEM_DATRS, /* proc.memory.datrss */
PCP_PROC_MEM_DIRTY, /* proc.memory.dirty */ PCP_PROC_MEM_DIRTY, /* proc.memory.dirty */
PCP_PROC_SMAPS_PSS, /* proc.smaps.pss */ PCP_PROC_SMAPS_PSS, /* proc.smaps.pss */
PCP_PROC_SMAPS_SWAP, /* proc.smaps.swap */ PCP_PROC_SMAPS_SWAP, /* proc.smaps.swap */
PCP_PROC_SMAPS_SWAPPSS, /* proc.smaps.swappss */ PCP_PROC_SMAPS_SWAPPSS, /* proc.smaps.swappss */
PCP_METRIC_COUNT /* total metric count */ PCP_METRIC_COUNT /* total metric count */
} Metric; } Metric;
void Metric_enable(Metric metric, bool enable); void Metric_enable(Metric metric, bool enable);