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 /ColumnsPanel.c | |
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 'ColumnsPanel.c')
-rw-r--r-- | ColumnsPanel.c | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/ColumnsPanel.c b/ColumnsPanel.c index 5382db0b..c49e8f78 100644 --- a/ColumnsPanel.c +++ b/ColumnsPanel.c @@ -11,7 +11,9 @@ in the source distribution for its full text. #include <stdlib.h> #include "CRT.h" +#include "DynamicColumn.h" #include "FunctionBar.h" +#include "Hashtable.h" #include "ListItem.h" #include "Object.h" #include "Process.h" @@ -115,6 +117,32 @@ const PanelClass ColumnsPanel_class = { .eventHandler = ColumnsPanel_eventHandler }; +typedef struct { + Panel* super; + unsigned int id; + unsigned int offset; +} DynamicIterator; + +static void ColumnsPanel_add(Panel* super, unsigned int key, Hashtable* columns) { + const char* name; + if (key < LAST_PROCESSFIELD) { + name = Process_fields[key].name; + } else { + const DynamicColumn* column = Hashtable_get(columns, key); + assert(column); + if (!column) { + name = NULL; + } else { + name = column->caption ? column->caption : column->heading; + if (!name) + name = column->name; /* name is a mandatory field */ + } + } + if (name == NULL) + name = "- "; + Panel_add(super, (Object*) ListItem_new(name, key)); +} + ColumnsPanel* ColumnsPanel_new(Settings* settings) { ColumnsPanel* this = AllocThis(ColumnsPanel); Panel* super = (Panel*) this; @@ -125,12 +153,11 @@ ColumnsPanel* ColumnsPanel_new(Settings* settings) { this->moving = false; Panel_setHeader(super, "Active Columns"); - const ProcessField* fields = this->settings->fields; - for (; *fields; fields++) { - if (Process_fields[*fields].name) { - Panel_add(super, (Object*) ListItem_new(Process_fields[*fields].name, *fields)); - } - } + Hashtable* dynamicColumns = settings->dynamicColumns; + const ProcessField* fields = settings->fields; + for (; *fields; fields++) + ColumnsPanel_add(super, *fields, dynamicColumns); + return this; } @@ -143,7 +170,8 @@ void ColumnsPanel_update(Panel* super) { for (int i = 0; i < size; i++) { int key = ((ListItem*) Panel_get(super, i))->key; this->settings->fields[i] = key; - this->settings->flags |= Process_fields[key].flags; + if (key < LAST_PROCESSFIELD) + this->settings->flags |= Process_fields[key].flags; } this->settings->fields[size] = 0; } |