diff options
author | Sohaib Mohamed <sohaib.amhmd@gmail.com> | 2021-07-11 03:11:29 +0200 |
---|---|---|
committer | Nathan Scott <nathans@redhat.com> | 2021-08-13 07:32:57 +0200 |
commit | 6f2021f3d95e02fc54e59fdeeb006e34c209b9c3 (patch) | |
tree | a31ea1264b871e5a7e7785398a382a7813eb1749 /solaris | |
parent | ed82ce6456f0f904a0ab2b346b85d7cf46df109c (diff) |
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.
Diffstat (limited to 'solaris')
-rw-r--r-- | solaris/Platform.h | 11 | ||||
-rw-r--r-- | solaris/SolarisProcessList.c | 4 | ||||
-rw-r--r-- | solaris/SolarisProcessList.h | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/solaris/Platform.h b/solaris/Platform.h index 90108776..caf296b8 100644 --- a/solaris/Platform.h +++ b/solaris/Platform.h @@ -31,6 +31,7 @@ in the source distribution for its full text. #include "Action.h" #include "BatteryMeter.h" #include "DiskIOMeter.h" +#include "Hashtable.h" #include "NetworkIOMeter.h" #include "ProcessLocksScreen.h" #include "SignalsPanel.h" @@ -128,9 +129,7 @@ IGNORE_WCASTQUAL_BEGIN IGNORE_WCASTQUAL_END } -static inline Hashtable* Platform_dynamicMeters(void) { - return NULL; -} +static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } @@ -138,4 +137,10 @@ static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { } +static inline Hashtable* Platform_dynamicColumns(void) { return NULL; } + +static inline const char* Platform_dynamicColumnInit(ATTR_UNUSED unsigned int key) { return NULL; } + +static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) { return false; } + #endif diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c index 63b1db80..e946bbad 100644 --- a/solaris/SolarisProcessList.c +++ b/solaris/SolarisProcessList.c @@ -88,10 +88,10 @@ static void SolarisProcessList_updateCPUcount(ProcessList* super) { } } -ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* pidMatchList, uid_t userId) { +ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* dynamicColumns, Hashtable* pidMatchList, uid_t userId) { SolarisProcessList* spl = xCalloc(1, sizeof(SolarisProcessList)); ProcessList* pl = (ProcessList*) spl; - ProcessList_init(pl, Class(SolarisProcess), usersTable, dynamicMeters, pidMatchList, userId); + ProcessList_init(pl, Class(SolarisProcess), usersTable, dynamicMeters, dynamicColumns, pidMatchList, userId); spl->kd = kstat_open(); if (!spl->kd) diff --git a/solaris/SolarisProcessList.h b/solaris/SolarisProcessList.h index bee35cce..f653b7cf 100644 --- a/solaris/SolarisProcessList.h +++ b/solaris/SolarisProcessList.h @@ -54,7 +54,7 @@ typedef struct SolarisProcessList_ { ZfsArcStats zfs; } SolarisProcessList; -ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* pidMatchList, uid_t userId); +ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* dynamicColumns, Hashtable* pidMatchList, uid_t userId); void ProcessList_delete(ProcessList* pl); |