Correctly handling PCP metric units and column widths.

Adds support for new 'format' keyword, updates to screens config files,
and some minor cleanup here & there.

Author: natoscott

AvailableColumnsPanel.c

@@ -85,7 +85,7 @@ const PanelClass AvailableColumnsPanel_class = {
 
 static void AvailableColumnsPanel_addDynamicColumn(ht_key_t key, void* value, void* data) {
    const DynamicColumn* column = (const DynamicColumn*) value;
-   if (column->belongToDynamicScreen)
+   if (column->hasDynamicScreen)
       return;
 
    Panel* super = (Panel*) data;

CommandLine.c

@@ -331,9 +331,11 @@ int CommandLine_run(const char* name, int argc, char** argv) {
 
    ProcessList* pl = ProcessList_new(ut, dm, dc, flags.pidMatchList, flags.userId);
    Settings* settings = Settings_new(pl->activeCPUs, dc);
-
+fprintf(stderr, "Settings created\n");
    Hashtable* dt = DynamicScreens_new(settings);
+fprintf(stderr, "DynamicScreens created\n");
    GenericDataList* gl = GenericDataList_new();
+fprintf(stderr, "GenericDataList created\n");
 
    pl->settings = settings;
    if (gl)

DynamicColumn.h

@@ -8,17 +8,17 @@
 #include "RichString.h"
 
 
-#define DYNAMIC_MAX_COLUMN_WIDTH 28
+#define DYNAMIC_MAX_COLUMN_WIDTH 64
 #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 */
-   bool belongToDynamicScreen; /* belong to DynamicScreen or ProcessList screen? */
-   bool enabled;               /* false == ignore this column */
+   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 */
+   bool hasDynamicScreen;  /* from a DynamicScreen or ProcessList screen? */
+   bool enabled;           /* false == ignore this column */
 } DynamicColumn;
 
 Hashtable* DynamicColumns_new(void);

GenericDataList.h

@@ -55,24 +55,16 @@ void GenericDataList_delete(GenericDataList* gl);
 /* One GenericData List */
 void GenericDataList_addList(void);
 
-//void GenericDataList_removeList(GenericDataList* g);
-
 /* struct GenericData */
 GenericData* GenericDataList_getGenericData(GenericDataList* this, GenericData_New constructor);
 
 void GenericDataList_addGenericData(GenericDataList* this, GenericData* g);
 
 void GenericDataList_removeGenericData(GenericDataList* this);
 
-/* helpers functions */
+/* helper functions */
 void GenericDataList_setPanel(GenericDataList* this, Panel* panel);
 
-void GenericDataList_printHeader(const GenericDataList* this, RichString* header); // TODO
-
-void GenericDataList_expandTree(GenericDataList* this); // TODO
-
-void GenericDataList_collapseAllBranches(GenericDataList* this); // TODO
-
 void GenericDataList_rebuildPanel(GenericDataList* this);
 
 void GenericDataList_scan(GenericDataList* this, bool pauseUpdate);

Makefile.am

@@ -381,6 +381,7 @@ endif
 # --------------------------
 
 pcp_platform_headers = \
+	linux/CGroupUtils.h \
 	linux/PressureStallMeter.h \
 	linux/ZramMeter.h \
 	linux/ZramStats.h \
@@ -399,6 +400,7 @@ pcp_platform_headers = \
 	zfs/ZfsCompressedArcMeter.h
 
 pcp_platform_sources = \
+	linux/CGroupUtils.c \
 	linux/PressureStallMeter.c \
 	linux/ZramMeter.c \
 	pcp/PCPDynamicColumn.c \

ProcessList.c

@@ -86,7 +86,7 @@ static const char* alignedDynamicColumnTitle(const ProcessList* this, int key, c
    const DynamicColumn* column = Hashtable_get(this->dynamicColumns, key);
    if (column == NULL)
       return "- ";
-   if (!column->enabled)
+   if (column->enabled == false)
       return "";
    int width = column->width;
    if (!width || abs(width) > DYNAMIC_MAX_COLUMN_WIDTH)

ScreenManager.c

@@ -140,7 +140,7 @@ static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTi
       // scan processes first - some header values are calculated there
       ProcessList_scan(pl, this->state->pauseUpdate);
 
-      if (this->settings->ss->generic)
+      if (this->settings->ss->dynamic)
          GenericDataList_scan(gl, this->state->pauseUpdate);
 
       // always update header, especially to avoid gaps in graph meters
@@ -152,7 +152,7 @@ static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTi
       *redraw = true;
    }
    if (*redraw) {
-      if (this->settings->ss->generic) {
+      if (this->settings->ss->dynamic) {
          *force_redraw = true;
          Vector_prune(pl->panel->items);
 

ScreensPanel.c

@@ -275,7 +275,7 @@ static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) {
    ScreenListItem* newFocus = (ScreenListItem*) Panel_getSelected(super);
    if (newFocus && oldFocus != newFocus) {
       ColumnsPanel_fill(this->columns, newFocus->ss, this->settings->dynamicColumns);
-      if (newFocus->ss->generic) {
+      if (newFocus->ss->dynamic) {
          char* currentScreen = newFocus->ss->name;
          DynamicScreen_availableColumns(currentScreen);
       } else {

Settings.c

@@ -285,7 +285,7 @@ ScreenSettings* Settings_newScreen(Settings* this, const ScreenDefaults* default
       .treeView = false,
       .treeViewAlwaysByPID = false,
       .allBranchesCollapsed = false,
-      .generic = false,
+      .dynamic = false,
    };
 
    ScreenSettings_readFields(ss, this->dynamicColumns, defaults->columns);
@@ -369,9 +369,9 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
       } else if (String_eq(option[0], "tree_view") && this->config_version <= 2) {
          screen = Settings_defaultScreens(this);
          screen->treeView = atoi(option[1]);
-      } else if (String_eq(option[0], "generic_screen") && this->config_version <= 2) {
+      } else if (String_eq(option[0], "dynamic_screen") && this->config_version <= 2) {
          screen = Settings_defaultScreens(this);
-         screen->generic = atoi(option[1]);
+         screen->dynamic = atoi(option[1]);
       } else if (String_eq(option[0], "tree_view_always_by_pid") && this->config_version <= 2) {
          // old (no screen) naming also supported for backwards compatibility
          screen = Settings_defaultScreens(this);
@@ -502,9 +502,9 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
       } else if (String_eq(option[0], ".tree_view")) {
          if (screen)
             screen->treeView = atoi(option[1]);
-      } else if (String_eq(option[0], ".generic_screen")) {
+      } else if (String_eq(option[0], ".dynamic_screen")) {
          if (screen)
-            screen->generic = atoi(option[1]);
+            screen->dynamic = atoi(option[1]);
       } else if (String_eq(option[0], ".tree_view_always_by_pid")) {
          if (screen)
             screen->treeViewAlwaysByPID = atoi(option[1]);
@@ -530,7 +530,7 @@ static void writeFields(FILE* fd, const ProcessField* fields, Hashtable* columns
          fprintf(fd, "%s%s", sep, pName);
       } else if (fields[i] >= LAST_PROCESSFIELD && byName) {
          const char* pName = toFieldName(columns, fields[i]);
-         fprintf(fd, " Dynamic(%s)", pName);
+         fprintf(fd, "%sDynamic(%s)", sep, pName);
       } else {
          // This "-1" is for compatibility with the older enum format.
          fprintf(fd, "%s%d", sep, (int) fields[i] - 1);
@@ -643,20 +643,21 @@ int Settings_write(const Settings* this, bool onCrash) {
    printSettingInteger("tree_view_always_by_pid", this->screens[0]->treeViewAlwaysByPID);
    printSettingInteger("all_branches_collapsed", this->screens[0]->allBranchesCollapsed);
 
+fprintf(stderr, "writing %d screens\n", (int)this->nScreens);
    for (unsigned int i = 0; i < this->nScreens; i++) {
-      if (this->screens[i]->generic)
-         continue;
       ScreenSettings* ss = this->screens[i];
       fprintf(fd, "screen:%s=", ss->name);
       writeFields(fd, ss->fields, this->dynamicColumns, true, separator);
-      printSettingString(".sort_key", toFieldName(this->dynamicColumns, ss->sortKey));
-      printSettingString(".tree_sort_key", toFieldName(this->dynamicColumns, ss->treeSortKey));
-      printSettingInteger(".tree_view", ss->treeView);
-      printSettingInteger(".tree_view_always_by_pid", ss->treeViewAlwaysByPID);
-      printSettingInteger(".sort_direction", ss->direction);
-      printSettingInteger(".tree_sort_direction", ss->treeDirection);
-      printSettingInteger(".all_branches_collapsed", ss->allBranchesCollapsed);
-      printSettingInteger(".generic_screen", ss->generic);
+      if (ss->dynamic == false) {
+         printSettingString(".sort_key", toFieldName(this->dynamicColumns, ss->sortKey));
+         printSettingString(".tree_sort_key", toFieldName(this->dynamicColumns, ss->treeSortKey));
+         printSettingInteger(".tree_view", ss->treeView);
+         printSettingInteger(".tree_view_always_by_pid", ss->treeViewAlwaysByPID);
+         printSettingInteger(".sort_direction", ss->direction);
+         printSettingInteger(".tree_sort_direction", ss->treeDirection);
+         printSettingInteger(".all_branches_collapsed", ss->allBranchesCollapsed);
+      }
+      printSettingInteger(".dynamic_screen", ss->dynamic);
    }
 
    #undef printSettingString

Settings.h

@@ -44,7 +44,7 @@ typedef struct {
    bool treeView;
    bool treeViewAlwaysByPID;
    bool allBranchesCollapsed;
-   bool generic;
+   bool dynamic;
 } ScreenSettings;
 
 typedef struct Settings_ {