forked from htop-dev/htop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Showing
59 changed files
with
1,063 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| htop - DynamicColumn.c | ||
| (C) 2021 Sohaib Mohammed | ||
| (C) 2021 htop dev team | ||
| (C) 2021 Red Hat, Inc. All Rights Reserved. | ||
| Released under the GNU GPLv2, see the COPYING file | ||
| in the source distribution for its full text. | ||
| */ | ||
|
|
||
| #include "config.h" // IWYU pragma: keep | ||
|
|
||
| #include "DynamicColumn.h" | ||
|
|
||
| #include <stddef.h> | ||
|
|
||
| #include "Platform.h" | ||
| #include "ProcessList.h" | ||
| #include "RichString.h" | ||
| #include "XUtils.h" | ||
|
|
||
|
|
||
| Hashtable* DynamicColumns_new(void) { | ||
| return Platform_dynamicColumns(); | ||
| } | ||
|
|
||
| const char* DynamicColumn_init(unsigned int key) { | ||
| return Platform_dynamicColumnInit(key); | ||
| } | ||
|
|
||
| typedef struct { | ||
| const char* name; | ||
| const DynamicColumn* data; | ||
| unsigned int key; | ||
| } DynamicIterator; | ||
|
|
||
| static void DynamicColumn_compare(ht_key_t key, void* value, void* data) { | ||
| const DynamicColumn* column = (const DynamicColumn*)value; | ||
| DynamicIterator* iter = (DynamicIterator*)data; | ||
| if (String_eq(iter->name, column->name)) { | ||
| iter->data = column; | ||
| iter->key = key; | ||
| } | ||
| } | ||
|
|
||
| const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name, unsigned int* key) { | ||
| DynamicIterator iter = { .key = 0, .data = NULL, .name = name }; | ||
| if (dynamics) | ||
| Hashtable_foreach(dynamics, DynamicColumn_compare, &iter); | ||
| if (key) | ||
| *key = iter.key; | ||
| return iter.data; | ||
| } | ||
|
|
||
| const DynamicColumn* DynamicColumn_lookup(Hashtable* dynamics, unsigned int key) { | ||
| return (const DynamicColumn*) Hashtable_get(dynamics, key); | ||
| } | ||
|
|
||
| bool DynamicColumn_writeField(const Process* proc, RichString* str, unsigned int key) { | ||
| return Platform_dynamicColumnWriteField(proc, str, key); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #ifndef HEADER_DynamicColumn | ||
| #define HEADER_DynamicColumn | ||
|
|
||
| #include "Hashtable.h" | ||
| #include "Process.h" | ||
| #include "ProcessList.h" | ||
| #include "RichString.h" | ||
|
|
||
|
|
||
| #define DYNAMIC_MAX_COLUMN_WIDTH 28 | ||
| #define DYNAMIC_DEFAULT_COLUMN_WIDTH -5 | ||
|
|
||
| typedef struct DynamicColumn_ { | ||
| char name[32]; /* unique, internal-only name */ | ||
| char* heading; /* displayed in main screen */ | ||
| char* caption; /* displayed in setup menu (short name) */ | ||
| char* description; /* displayed in setup menu (detail) */ | ||
| int width; /* display width +/- for value alignment */ | ||
| } DynamicColumn; | ||
|
|
||
| Hashtable* DynamicColumns_new(void); | ||
|
|
||
| const char* DynamicColumn_init(unsigned int key); | ||
|
|
||
| const DynamicColumn* DynamicColumn_lookup(Hashtable* dynamics, unsigned int key); | ||
|
|
||
| const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name, unsigned int* field); | ||
|
|
||
| bool DynamicColumn_writeField(const Process* proc, RichString* str, unsigned int key); | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.