Merge branch 'hishamhm-pull-920'

Document the htop.dev site, #htop and htop@groups.io for contacting
the community maintainers, and the upcoming 3.0.0 release.

.editorconfig

@@ -14,3 +14,4 @@ charset = utf-8
 [*.{c,h}]
 indent_style = space
 indent_size = 3
+trim_trailing_whitespace = true

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build-ubuntu-latest:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: |
+        sudo apt-get install libncursesw5-dev
+        ./autogen.sh
+        ./configure
+        make
+
+#  build-macos-latest:
+#    runs-on: macos-latest
+#    steps:
+#    - uses: actions/checkout@v2
+#    - name: make
+#      run: |
+#        ./autogen.sh
+#        ./configure
+#        make

.gitignore

@@ -20,6 +20,7 @@ htop
 .deps/
 Makefile
 Makefile.in
+INSTALL
 aclocal.m4
 autom4te.cache/
 compile

Action.c

@@ -62,7 +62,7 @@ typedef struct State_ {
 
 }*/
 
-Object* Action_pickFromVector(State* st, Panel* list, int x) {
+Object* Action_pickFromVector(State* st, Panel* list, int x, bool followProcess) {
    Panel* panel = st->panel;
    Header* header = st->header;
    Settings* settings = st->settings;
@@ -75,8 +75,8 @@ Object* Action_pickFromVector(State* st, Panel* list, int x) {
    Panel* panelFocus;
    int ch;
    bool unfollow = false;
-   int pid = MainPanel_selectedPid((MainPanel*)panel);
+   int pid = followProcess ? MainPanel_selectedPid((MainPanel*)panel) : -1;
-   if (header->pl->following == -1) {
+   if (followProcess && header->pl->following == -1) {
       header->pl->following = pid;
       unfollow = true;
    }
@@ -88,11 +88,16 @@ Object* Action_pickFromVector(State* st, Panel* list, int x) {
    Panel_move(panel, 0, y);
    Panel_resize(panel, COLS, LINES-y-1);
    if (panelFocus == list && ch == 13) {
-      Process* selected = (Process*)Panel_getSelected(panel);
+      if (followProcess) {
-      if (selected && selected->pid == pid)
+         Process* selected = (Process*)Panel_getSelected(panel);
+         if (selected && selected->pid == pid)
+            return Panel_getSelected(list);
+         else
+            beep();
+      } else {
          return Panel_getSelected(list);
-      else
+      }
-         beep();
+
    }
    return NULL;
 }
@@ -115,7 +120,7 @@ static void Action_runSetup(Settings* settings, const Header* header, ProcessLis
 
 static bool changePriority(MainPanel* panel, int delta) {
    bool anyTagged;
-   bool ok = MainPanel_foreachProcess(panel, (MainPanel_ForeachProcessFn) Process_changePriorityBy, delta, &anyTagged);
+   bool ok = MainPanel_foreachProcess(panel, (MainPanel_ForeachProcessFn) Process_changePriorityBy, (Arg){ .i = delta }, &anyTagged);
    if (!ok)
       beep();
    return anyTagged;
@@ -155,6 +160,21 @@ static bool expandCollapse(Panel* panel) {
    return true;
 }
 
+static bool collapseIntoParent(Panel* panel) {
+   Process* p = (Process*) Panel_getSelected(panel);
+   if (!p) return false;
+   pid_t ppid = Process_getParentPid(p);
+   for (int i = 0; i < Panel_size(panel); i++) {
+      Process* q = (Process*) Panel_get(panel, i);
+      if (q->pid == ppid) {
+         q->showChildren = false;
+         Panel_setSelected(panel, i);
+         return true;
+      }
+   }
+   return false;
+}
+
 Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey) {
    settings->sortKey = sortKey;
    settings->direction = 1;
@@ -174,7 +194,7 @@ static Htop_Reaction sortBy(State* st) {
          Panel_setSelected(sortPanel, i);
       free(name);
    }
-   ListItem* field = (ListItem*) Action_pickFromVector(st, sortPanel, 15);
+   ListItem* field = (ListItem*) Action_pickFromVector(st, sortPanel, 15, false);
    if (field) {
       reaction |= Action_setSortKey(st->settings, field->key);
    }
@@ -185,6 +205,7 @@ static Htop_Reaction sortBy(State* st) {
 // ----------------------------------------
 
 static Htop_Reaction actionResize(State* st) {
+   clear();
    Panel_resize(st->panel, COLS, LINES-(st->panel->y)-1);
    return HTOP_REDRAW_BAR;
 }
@@ -232,10 +253,21 @@ static Htop_Reaction actionIncFilter(State* st) {
 }
 
 static Htop_Reaction actionIncSearch(State* st) {
+   IncSet_reset(((MainPanel*)st->panel)->inc, INC_SEARCH);
    IncSet_activate(((MainPanel*)st->panel)->inc, INC_SEARCH, st->panel);
    return HTOP_REFRESH | HTOP_KEEP_FOLLOWING;
 }
 
+static Htop_Reaction actionIncNext(State* st) {
+   IncSet_next(((MainPanel*)st->panel)->inc, INC_SEARCH, st->panel, (IncMode_GetPanelValue) MainPanel_getValue);
+   return HTOP_REFRESH | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionIncPrev(State* st) {
+   IncSet_prev(((MainPanel*)st->panel)->inc, INC_SEARCH, st->panel, (IncMode_GetPanelValue) MainPanel_getValue);
+   return HTOP_REFRESH | HTOP_KEEP_FOLLOWING;
+}
+
 static Htop_Reaction actionHigherPriority(State* st) {
    bool changed = changePriority((MainPanel*)st->panel, -1);
    return changed ? HTOP_REFRESH : HTOP_OK;
@@ -260,6 +292,14 @@ static Htop_Reaction actionExpandOrCollapse(State* st) {
    return changed ? HTOP_RECALCULATE : HTOP_OK;
 }
 
+static Htop_Reaction actionCollapseIntoParent(State* st) {
+   if (!st->settings->treeView) {
+      return HTOP_OK;
+   }
+   bool changed = collapseIntoParent(st->panel);
+   return changed ? HTOP_RECALCULATE : HTOP_OK;
+}
+
 static Htop_Reaction actionExpandCollapseOrSortColumn(State* st) {
    return st->settings->treeView ? actionExpandOrCollapse(st) : actionSetSortColumn(st);
 }
@@ -281,10 +321,10 @@ static Htop_Reaction actionSetAffinity(State* st) {
    Panel* affinityPanel = AffinityPanel_new(st->pl, affinity);
    Affinity_delete(affinity);
 
-   void* set = Action_pickFromVector(st, affinityPanel, 15);
+   void* set = Action_pickFromVector(st, affinityPanel, 15, true);
    if (set) {
       Affinity* affinity = AffinityPanel_getAffinity(affinityPanel, st->pl);
-      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) Affinity_set, (size_t) affinity, NULL);
+      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) Affinity_set, (Arg){ .v = affinity }, NULL);
       if (!ok) beep();
       Affinity_delete(affinity);
    }
@@ -295,13 +335,13 @@ static Htop_Reaction actionSetAffinity(State* st) {
 
 static Htop_Reaction actionKill(State* st) {
    Panel* signalsPanel = (Panel*) SignalsPanel_new();
-   ListItem* sgn = (ListItem*) Action_pickFromVector(st, signalsPanel, 15);
+   ListItem* sgn = (ListItem*) Action_pickFromVector(st, signalsPanel, 15, true);
    if (sgn) {
       if (sgn->key != 0) {
          Panel_setHeader(st->panel, "Sending...");
          Panel_draw(st->panel, true);
          refresh();
-         MainPanel_foreachProcess((MainPanel*)st->panel, (MainPanel_ForeachProcessFn) Process_sendSignal, (size_t) sgn->key, NULL);
+         MainPanel_foreachProcess((MainPanel*)st->panel, (MainPanel_ForeachProcessFn) Process_sendSignal, (Arg){ .i = sgn->key }, NULL);
          napms(500);
       }
    }
@@ -316,7 +356,7 @@ static Htop_Reaction actionFilterByUser(State* st) {
    Vector_insertionSort(usersPanel->items);
    ListItem* allUsers = ListItem_new("All users", -1);
    Panel_insert(usersPanel, 0, (Object*) allUsers);
-   ListItem* picked = (ListItem*) Action_pickFromVector(st, usersPanel, 20);
+   ListItem* picked = (ListItem*) Action_pickFromVector(st, usersPanel, 20, false);
    if (picked) {
       if (picked == allUsers) {
          st->pl->userId = -1;
@@ -439,7 +479,7 @@ static Htop_Reaction actionHelp(State* st) {
    if (settings->detailedCPUTime) {
       addattrstr(CRT_colors[CPU_NICE_TEXT], "low"); addstr("/");
       addattrstr(CRT_colors[CPU_NORMAL], "normal"); addstr("/");
-      addattrstr(CRT_colors[CPU_KERNEL], "kernel"); addstr("/");
+      addattrstr(CRT_colors[CPU_SYSTEM], "kernel"); addstr("/");
       addattrstr(CRT_colors[CPU_IRQ], "irq"); addstr("/");
       addattrstr(CRT_colors[CPU_SOFTIRQ], "soft-irq"); addstr("/");
       addattrstr(CRT_colors[CPU_STEAL], "steal"); addstr("/");
@@ -449,8 +489,8 @@ static Htop_Reaction actionHelp(State* st) {
    } else {
       addattrstr(CRT_colors[CPU_NICE_TEXT], "low-priority"); addstr("/");
       addattrstr(CRT_colors[CPU_NORMAL], "normal"); addstr("/");
-      addattrstr(CRT_colors[CPU_KERNEL], "kernel"); addstr("/");
+      addattrstr(CRT_colors[CPU_SYSTEM], "kernel"); addstr("/");
-      addattrstr(CRT_colors[CPU_STEAL], "virtualiz");
+      addattrstr(CRT_colors[CPU_GUEST], "virtualiz");
       addattrstr(CRT_colors[BAR_SHADOW], "               used%");
    }
    addattrstr(CRT_colors[BAR_BORDER], "]");
@@ -535,6 +575,8 @@ void Action_setBindings(Htop_Action* keys) {
    keys['\\'] = actionIncFilter;
    keys[KEY_F(3)] = actionIncSearch;
    keys['/'] = actionIncSearch;
+   keys['n'] = actionIncNext;
+   keys['N'] = actionIncPrev;
 
    keys[']'] = actionHigherPriority;
    keys[KEY_F(7)] = actionHigherPriority;
@@ -556,6 +598,7 @@ void Action_setBindings(Htop_Action* keys) {
    keys['+'] = actionExpandOrCollapse;
    keys['='] = actionExpandOrCollapse;
    keys['-'] = actionExpandOrCollapse;
+   keys['\177'] = actionCollapseIntoParent;
    keys['u'] = actionFilterByUser;
    keys['F'] = Action_follow;
    keys['S'] = actionSetup;

Action.h

@@ -39,20 +39,20 @@ typedef struct State_ {
 } State;
 
 
-Object* Action_pickFromVector(State* st, Panel* list, int x);
+extern Object* Action_pickFromVector(State* st, Panel* list, int x, bool followProcess);
 
 // ----------------------------------------
 
-bool Action_setUserOnly(const char* userName, uid_t* userId);
+extern bool Action_setUserOnly(const char* userName, uid_t* userId);
 
-Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey);
+extern Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey);
 
 // ----------------------------------------
 
-Htop_Reaction Action_follow(State* st);
+extern Htop_Reaction Action_follow(State* st);
 
 
-void Action_setBindings(Htop_Action* keys);
+extern void Action_setBindings(Htop_Action* keys);
 
 
 #endif

Affinity.c

@@ -1,6 +1,7 @@
 /*
 htop - Affinity.c
 (C) 2004-2011 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -79,7 +80,8 @@ Affinity* Affinity_get(Process* proc, ProcessList* pl) {
    return affinity;
 }
 
-bool Affinity_set(Process* proc, Affinity* this) {
+bool Affinity_set(Process* proc, Arg arg) {
+   Affinity *this = arg.v;
    hwloc_cpuset_t cpuset = hwloc_bitmap_alloc();
    for (int i = 0; i < this->used; i++) {
       hwloc_bitmap_set(cpuset, this->cpus[i]);
@@ -103,7 +105,8 @@ Affinity* Affinity_get(Process* proc, ProcessList* pl) {
    return affinity;
 }
 
-bool Affinity_set(Process* proc, Affinity* this) {
+bool Affinity_set(Process* proc, Arg arg) {
+   Affinity *this = arg.v;
    cpu_set_t cpuset;
    CPU_ZERO(&cpuset);
    for (int i = 0; i < this->used; i++) {

Affinity.h

@@ -5,6 +5,7 @@
 /*
 htop - Affinity.h
 (C) 2004-2011 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -29,23 +30,23 @@ typedef struct Affinity_ {
 } Affinity;
 
 
-Affinity* Affinity_new(ProcessList* pl);
+extern Affinity* Affinity_new(ProcessList* pl);
 
-void Affinity_delete(Affinity* this);
+extern void Affinity_delete(Affinity* this);
 
-void Affinity_add(Affinity* this, int id);
+extern void Affinity_add(Affinity* this, int id);
 
 #ifdef HAVE_LIBHWLOC
 
-Affinity* Affinity_get(Process* proc, ProcessList* pl);
+extern Affinity* Affinity_get(Process* proc, ProcessList* pl);
 
-bool Affinity_set(Process* proc, Affinity* this);
+extern bool Affinity_set(Process* proc, Arg arg);
 
 #elif HAVE_LINUX_AFFINITY
 
-Affinity* Affinity_get(Process* proc, ProcessList* pl);
+extern Affinity* Affinity_get(Process* proc, ProcessList* pl);
 
-bool Affinity_set(Process* proc, Affinity* this);
+extern bool Affinity_set(Process* proc, Arg arg);
 
 #endif
 

AffinityPanel.h

@@ -16,8 +16,8 @@ in the source distribution for its full text.
 
 extern PanelClass AffinityPanel_class;
 
-Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity);
+extern Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity);
 
-Affinity* AffinityPanel_getAffinity(Panel* this, ProcessList* pl);
+extern Affinity* AffinityPanel_getAffinity(Panel* this, ProcessList* pl);
 
 #endif

AvailableColumnsPanel.h

@@ -19,6 +19,6 @@ typedef struct AvailableColumnsPanel_ {
 
 extern PanelClass AvailableColumnsPanel_class;
 
-AvailableColumnsPanel* AvailableColumnsPanel_new(Panel* columns);
+extern AvailableColumnsPanel* AvailableColumnsPanel_new(Panel* columns);
 
 #endif

AvailableMetersPanel.c

@@ -127,7 +127,7 @@ AvailableMetersPanel* AvailableMetersPanel_new(Settings* settings, Header* heade
       Panel_add(super, (Object*) ListItem_new("CPU average", 0));
       for (int i = 1; i <= cpus; i++) {
          char buffer[50];
-         xSnprintf(buffer, 50, "%s %d", type->uiName, i);
+         xSnprintf(buffer, 50, "%s %d", type->uiName, Settings_cpuId(this->settings, i - 1));
          Panel_add(super, (Object*) ListItem_new(buffer, i));
       }
    } else {

AvailableMetersPanel.h

@@ -27,6 +27,6 @@ typedef struct AvailableMetersPanel_ {
 
 extern PanelClass AvailableMetersPanel_class;
 
-AvailableMetersPanel* AvailableMetersPanel_new(Settings* settings, Header* header, Panel* leftMeters, Panel* rightMeters, ScreenManager* scr, ProcessList* pl);
+extern AvailableMetersPanel* AvailableMetersPanel_new(Settings* settings, Header* header, Panel* leftMeters, Panel* rightMeters, ScreenManager* scr, ProcessList* pl);
 
 #endif

CONTRIBUTING.md

@@ -0,0 +1,56 @@
+
+Contributing Guide
+==================
+
+Hello, and thank you so much for taking your time to contribute in any way to
+htop! There are many ways to contribute, and I'll try to list them below. The
+support from the free software community has been amazing over the years and
+it is the number one thing that keeps me going, maintaining and improving
+something that started as a tiny pet project back in 2004 and that nowadays is
+a piece of software used all over the world, in both reality [and
+fiction!](http://hisham.hm/htop/index.php?page=sightings). Cheers!
+
+-- Hisham Muhammad
+
+Bug Reports
+-----------
+
+Bug reports should be posted in the [Github issue
+tracker](http://github.com/hishamhm/htop/issues). (I reply to them all, but I
+usually do it in batches! :) ) Bug reports are extremely important since it's
+impossible for me to test htop in every possible system, distribution and
+scenario. Your feedback is what keeps the tool stable and always improving!
+Thank you!
+
+Pull Requests
+-------------
+
+Code contributions are most welcome! Just [fork the
+repo](http://github.com/hishamhm/htop) and send a [pull
+request](https://github.com/hishamhm/htop/pulls). Help is especially
+appreciated for support of platforms other than Linux. If proposing new
+features, please be mindful that htop is a system tool that needs to keep a
+small footprint and perform well on systems under stress -- so unfortunately I
+can't accept every new feature proposed, as I need to keep the tool slim and
+maintainable. Great ideas backed by a PR are always carefully considered for
+inclusion, though! Also, PRs containing bug fixes and portability tweaks are a
+no-brainer, please send those in!
+
+Feature Requests
+----------------
+
+Back when htop was hosted in SourceForge, there used to be separate Bug
+Tracker and Feature Request pages. These go all lumped together under "Issues"
+in Github, which is a bit confusing. For this reason, I close Feature Requests
+and file them with the [`feature
+request`](https://github.com/hishamhm/htop/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%22feature+request%22+)
+label, where they remain accessible, but not mixed with actual bug reports.
+This doesn't mean I'm dismissing or ignoring feature requests right away! It's
+just an organizational issue (with Github, really!).
+
+Donations
+---------
+
+If you like htop, feel free to [buy the author a
+beer](http://hisham.hm/htop/index.php?page=donate). :-) 
+

CPUMeter.c

@@ -28,13 +28,14 @@ typedef enum {
    CPU_METER_STEAL = 5,
    CPU_METER_GUEST = 6,
    CPU_METER_IOWAIT = 7,
-   CPU_METER_ITEMCOUNT = 8, // number of entries in this enum
+   CPU_METER_FREQUENCY = 8,
+   CPU_METER_ITEMCOUNT = 9, // number of entries in this enum
 } CPUMeterValues;
 
 }*/
 
 int CPUMeter_attributes[] = {
-   CPU_NICE, CPU_NORMAL, CPU_KERNEL, CPU_IRQ, CPU_SOFTIRQ, CPU_STEAL, CPU_GUEST, CPU_IOWAIT
+   CPU_NICE, CPU_NORMAL, CPU_SYSTEM, CPU_IRQ, CPU_SOFTIRQ, CPU_STEAL, CPU_GUEST, CPU_IOWAIT
 };
 
 #ifndef MIN
@@ -63,7 +64,30 @@ static void CPUMeter_updateValues(Meter* this, char* buffer, int size) {
    }
    memset(this->values, 0, sizeof(double) * CPU_METER_ITEMCOUNT);
    double percent = Platform_setCPUValues(this, cpu);
-   xSnprintf(buffer, size, "%5.1f%%", percent);
+   if (this->pl->settings->showCPUFrequency) {
+      /* Initial frequency is in MHz. Emit it as GHz if it's larger than 1000MHz */
+      double cpuFrequency = this->values[CPU_METER_FREQUENCY];
+      char unit = 'M';
+      char cpuFrequencyBuffer[16];
+      if (cpuFrequency < 0) {
+         xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A");
+      } else {
+         if (cpuFrequency > 1000) {
+            cpuFrequency /= 1000;
+            unit = 'G';
+         }
+         xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.3f%cHz", cpuFrequency, unit);
+      }
+      if (this->pl->settings->showCPUUsage) {
+         xSnprintf(buffer, size, "%5.1f%% %s", percent, cpuFrequencyBuffer);
+      } else {
+         xSnprintf(buffer, size, "%s", cpuFrequencyBuffer);
+      }
+   } else if (this->pl->settings->showCPUUsage) {
+      xSnprintf(buffer, size, "%5.1f%%", percent);
+   } else if (size > 0) {
+      buffer[0] = '\0';
+   }
 }
 
 static void CPUMeter_display(Object* cast, RichString* out) {
@@ -80,7 +104,7 @@ static void CPUMeter_display(Object* cast, RichString* out) {
    if (this->pl->settings->detailedCPUTime) {
       xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_KERNEL]);
       RichString_append(out, CRT_colors[METER_TEXT], "sy:");
-      RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
+      RichString_append(out, CRT_colors[CPU_SYSTEM], buffer);
       xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_NICE]);
       RichString_append(out, CRT_colors[METER_TEXT], "ni:");
       RichString_append(out, CRT_colors[CPU_NICE_TEXT], buffer);
@@ -106,7 +130,7 @@ static void CPUMeter_display(Object* cast, RichString* out) {
    } else {
       xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_KERNEL]);
       RichString_append(out, CRT_colors[METER_TEXT], "sys:");
-      RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
+      RichString_append(out, CRT_colors[CPU_SYSTEM], buffer);
       xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_NICE]);
       RichString_append(out, CRT_colors[METER_TEXT], "low:");
       RichString_append(out, CRT_colors[CPU_NICE_TEXT], buffer);
@@ -137,6 +161,15 @@ static void AllCPUsMeter_getRange(Meter* this, int* start, int* count) {
    }
 }
 
+static int MapClassnameToColumncount(Meter* this){
+   if (strchr(Meter_name(this), '4'))
+      return 4;
+   else if (strchr(Meter_name(this), '2'))
+      return 2;
+   else
+      return 1;
+}
+
 static void AllCPUsMeter_init(Meter* this) {
    int cpus = this->pl->cpuCount;
    if (!this->drawData)
@@ -152,10 +185,8 @@ static void AllCPUsMeter_init(Meter* this) {
    if (this->mode == 0)
       this->mode = BAR_METERMODE;
    int h = Meter_modes[this->mode]->h;
-   if (strchr(Meter_name(this), '2'))
+   int ncol = MapClassnameToColumncount(this);
-      this->h = h * ((count+1) / 2);
+   this->h = h * ((count + ncol - 1)/ ncol);
-   else
-      this->h = h * count;
 }
 
 static void AllCPUsMeter_done(Meter* this) {
@@ -175,10 +206,8 @@ static void AllCPUsMeter_updateMode(Meter* this, int mode) {
    for (int i = 0; i < count; i++) {
       Meter_setMode(meters[i], mode);
    }
-   if (strchr(Meter_name(this), '2'))
+   int ncol = MapClassnameToColumncount(this);
-      this->h = h * ((count+1) / 2);
+   this->h = h * ((count + ncol - 1)/ ncol);
-   else
-      this->h = h * count;
 }
 
 static void DualColCPUsMeter_draw(Meter* this, int x, int y, int w) {
@@ -209,6 +238,22 @@ static void SingleColCPUsMeter_draw(Meter* this, int x, int y, int w) {
    }
 }
 
+static void MultiColCPUsMeter_draw(Meter* this, int x, int y, int w){
+  Meter** meters = (Meter**) this->drawData;
+  int start, count;
+  AllCPUsMeter_getRange(this, &start, &count);
+  int ncol = MapClassnameToColumncount(this);
+  int colwidth = (w-ncol)/ncol + 1;
+  int diff = (w - (colwidth * ncol));
+  int nrows = (count + ncol - 1) / ncol;
+  for (int i = 0; i < count; i++){
+    int d = (i/nrows) > diff ? diff : (i / nrows) ; // dynamic spacer
+    int xpos = x + ((i / nrows) * colwidth) + d;
+    int ypos = y + ((i % nrows) * meters[0]->h);
+    meters[i]->draw(meters[i], xpos, ypos, colwidth);
+  }
+}
+
 MeterClass CPUMeter_class = {
    .super = {
       .extends = Class(Meter),
@@ -340,3 +385,59 @@ MeterClass RightCPUs2Meter_class = {
    .done = AllCPUsMeter_done
 };
 
+MeterClass AllCPUs4Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .defaultMode = CUSTOM_METERMODE,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "AllCPUs4",
+   .uiName = "CPUs (1&2&3&4/4)",
+   .description = "CPUs (1&2&3&4/4): all CPUs in 4 shorter columns",
+   .caption = "CPU",
+   .draw = MultiColCPUsMeter_draw,
+   .init = AllCPUsMeter_init,
+   .updateMode = AllCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+MeterClass LeftCPUs4Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .defaultMode = CUSTOM_METERMODE,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "LeftCPUs4",
+   .uiName = "CPUs (1-4/8)",
+   .description = "CPUs (1-4/8): first half in 4 shorter columns",
+   .caption = "CPU",
+   .draw = MultiColCPUsMeter_draw,
+   .init = AllCPUsMeter_init,
+   .updateMode = AllCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+MeterClass RightCPUs4Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .defaultMode = CUSTOM_METERMODE,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "RightCPUs4",
+   .uiName = "CPUs (5-8/8)",
+   .description = "CPUs (5-8/8): second half in 4 shorter columns",
+   .caption = "CPU",
+   .draw = MultiColCPUsMeter_draw,
+   .init = AllCPUsMeter_init,
+   .updateMode = AllCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};

CPUMeter.h

@@ -20,7 +20,8 @@ typedef enum {
    CPU_METER_STEAL = 5,
    CPU_METER_GUEST = 6,
    CPU_METER_IOWAIT = 7,
-   CPU_METER_ITEMCOUNT = 8, // number of entries in this enum
+   CPU_METER_FREQUENCY = 8,
+   CPU_METER_ITEMCOUNT = 9, // number of entries in this enum
 } CPUMeterValues;
 
 
@@ -47,5 +48,10 @@ extern MeterClass LeftCPUs2Meter_class;
 
 extern MeterClass RightCPUs2Meter_class;
 
+extern MeterClass AllCPUs4Meter_class;
+
+extern MeterClass LeftCPUs4Meter_class;
+
+extern MeterClass RightCPUs4Meter_class;
 
 #endif

CRT.c

@@ -122,18 +122,28 @@ typedef enum ColorElements_ {
    CPU_NICE,
    CPU_NICE_TEXT,
    CPU_NORMAL,
-   CPU_KERNEL,
+   CPU_SYSTEM,
    CPU_IOWAIT,
    CPU_IRQ,
    CPU_SOFTIRQ,
    CPU_STEAL,
    CPU_GUEST,
+   PRESSURE_STALL_TEN,
+   PRESSURE_STALL_SIXTY,
+   PRESSURE_STALL_THREEHUNDRED,
+   ZFS_MFU,
+   ZFS_MRU,
+   ZFS_ANON,
+   ZFS_HEADER,
+   ZFS_OTHER,
+   ZFS_COMPRESSED,
+   ZFS_RATIO,
    LAST_COLORELEMENT
 } ColorElements;
 
-void CRT_fatalError(const char* note) __attribute__ ((noreturn));
+extern void CRT_fatalError(const char* note) __attribute__ ((noreturn));
 
-void CRT_handleSIGSEGV(int sgn);
+extern void CRT_handleSIGSEGV(int sgn);
 
 #define KEY_ALT(x) (KEY_F(64 - 26) + (x - 'A'))
 
@@ -226,12 +236,22 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = ColorPair(Blue,Black),
       [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue,Black),
       [CPU_NORMAL] = ColorPair(Green,Black),
-      [CPU_KERNEL] = ColorPair(Red,Black),
+      [CPU_SYSTEM] = ColorPair(Red,Black),
-      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
+      [CPU_IOWAIT] = A_BOLD | ColorPairGrayBlack,
       [CPU_IRQ] = ColorPair(Yellow,Black),
       [CPU_SOFTIRQ] = ColorPair(Magenta,Black),
       [CPU_STEAL] = ColorPair(Cyan,Black),
       [CPU_GUEST] = ColorPair(Cyan,Black),
+      [PRESSURE_STALL_THREEHUNDRED] = ColorPair(Cyan,Black),
+      [PRESSURE_STALL_SIXTY] = A_BOLD | ColorPair(Cyan,Black),
+      [PRESSURE_STALL_TEN] = A_BOLD | ColorPair(White,Black),
+      [ZFS_MFU] = ColorPair(Blue,Black),
+      [ZFS_MRU] = ColorPair(Yellow,Black),
+      [ZFS_ANON] = ColorPair(Magenta,Black),
+      [ZFS_HEADER] = ColorPair(Cyan,Black),
+      [ZFS_OTHER] = ColorPair(Magenta,Black),
+      [ZFS_COMPRESSED] = ColorPair(Blue,Black),
+      [ZFS_RATIO] = ColorPair(Magenta,Black),
    },
    [COLORSCHEME_MONOCHROME] = {
       [RESET_COLOR] = A_NORMAL,
@@ -285,12 +305,22 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = A_NORMAL,
       [CPU_NICE_TEXT] = A_NORMAL,
       [CPU_NORMAL] = A_BOLD,
-      [CPU_KERNEL] = A_BOLD,
+      [CPU_SYSTEM] = A_BOLD,
       [CPU_IOWAIT] = A_NORMAL,
       [CPU_IRQ] = A_BOLD,
       [CPU_SOFTIRQ] = A_BOLD,
       [CPU_STEAL] = A_REVERSE,
       [CPU_GUEST] = A_REVERSE,
+      [PRESSURE_STALL_THREEHUNDRED] = A_DIM,
+      [PRESSURE_STALL_SIXTY] = A_NORMAL,
+      [PRESSURE_STALL_TEN] = A_BOLD,
+      [ZFS_MFU] = A_NORMAL,
+      [ZFS_MRU] = A_NORMAL,
+      [ZFS_ANON] = A_DIM,
+      [ZFS_HEADER] = A_BOLD,
+      [ZFS_OTHER] = A_DIM,
+      [ZFS_COMPRESSED] = A_BOLD,
+      [ZFS_RATIO] = A_BOLD,
    },
    [COLORSCHEME_BLACKONWHITE] = {
       [RESET_COLOR] = ColorPair(Black,White),
@@ -344,12 +374,22 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = ColorPair(Cyan,White),
       [CPU_NICE_TEXT] = ColorPair(Cyan,White),
       [CPU_NORMAL] = ColorPair(Green,White),
-      [CPU_KERNEL] = ColorPair(Red,White),
+      [CPU_SYSTEM] = ColorPair(Red,White),
-      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, White),
+      [CPU_IOWAIT] = A_BOLD | ColorPair(Black,White),
       [CPU_IRQ] = ColorPair(Blue,White),
       [CPU_SOFTIRQ] = ColorPair(Blue,White),
       [CPU_STEAL] = ColorPair(Cyan,White),
       [CPU_GUEST] = ColorPair(Cyan,White),
+      [PRESSURE_STALL_THREEHUNDRED] = ColorPair(Black,White),
+      [PRESSURE_STALL_SIXTY] = ColorPair(Black,White),
+      [PRESSURE_STALL_TEN] = ColorPair(Black,White),
+      [ZFS_MFU] = ColorPair(Cyan,White),
+      [ZFS_MRU] = ColorPair(Yellow,White),
+      [ZFS_ANON] = ColorPair(Magenta,White),
+      [ZFS_HEADER] = ColorPair(Yellow,White),
+      [ZFS_OTHER] = ColorPair(Magenta,White),
+      [ZFS_COMPRESSED] = ColorPair(Cyan,White),
+      [ZFS_RATIO] = ColorPair(Magenta,White),
    },
    [COLORSCHEME_LIGHTTERMINAL] = {
       [RESET_COLOR] = ColorPair(Black,Black),
@@ -403,12 +443,22 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = ColorPair(Cyan,Black),
       [CPU_NICE_TEXT] = ColorPair(Cyan,Black),
       [CPU_NORMAL] = ColorPair(Green,Black),
-      [CPU_KERNEL] = ColorPair(Red,Black),
+      [CPU_SYSTEM] = ColorPair(Red,Black),
-      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
+      [CPU_IOWAIT] = A_BOLD | ColorPair(Black,Black),
       [CPU_IRQ] = A_BOLD | ColorPair(Blue,Black),
       [CPU_SOFTIRQ] = ColorPair(Blue,Black),
       [CPU_STEAL] = ColorPair(Black,Black),
       [CPU_GUEST] = ColorPair(Black,Black),
+      [PRESSURE_STALL_THREEHUNDRED] = ColorPair(Black,Black),
+      [PRESSURE_STALL_SIXTY] = ColorPair(Black,Black),
+      [PRESSURE_STALL_TEN] = ColorPair(Black,Black),
+      [ZFS_MFU] = ColorPair(Cyan,Black),
+      [ZFS_MRU] = ColorPair(Yellow,Black),
+      [ZFS_ANON] = A_BOLD | ColorPair(Magenta,Black),
+      [ZFS_HEADER] = ColorPair(Black,Black),
+      [ZFS_OTHER] = A_BOLD | ColorPair(Magenta,Black),
+      [ZFS_COMPRESSED] = ColorPair(Cyan,Black),
+      [ZFS_RATIO] = A_BOLD | ColorPair(Magenta,Black),
    },
    [COLORSCHEME_MIDNIGHT] = {
       [RESET_COLOR] = ColorPair(White,Blue),
@@ -462,12 +512,22 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = A_BOLD | ColorPair(Cyan,Blue),
       [CPU_NICE_TEXT] = A_BOLD | ColorPair(Cyan,Blue),
       [CPU_NORMAL] = A_BOLD | ColorPair(Green,Blue),
-      [CPU_KERNEL] = A_BOLD | ColorPair(Red,Blue),
+      [CPU_SYSTEM] = A_BOLD | ColorPair(Red,Blue),
       [CPU_IOWAIT] = A_BOLD | ColorPair(Blue,Blue),
       [CPU_IRQ] = A_BOLD | ColorPair(Black,Blue),
       [CPU_SOFTIRQ] = ColorPair(Black,Blue),
       [CPU_STEAL] = ColorPair(White,Blue),
       [CPU_GUEST] = ColorPair(White,Blue),
+      [PRESSURE_STALL_THREEHUNDRED] = A_BOLD | ColorPair(Black,Blue),
+      [PRESSURE_STALL_SIXTY] = A_NORMAL | ColorPair(White,Blue),
+      [PRESSURE_STALL_TEN] = A_BOLD | ColorPair(White,Blue),
+      [ZFS_MFU] = A_BOLD | ColorPair(White,Blue),
+      [ZFS_MRU] = A_BOLD | ColorPair(Yellow,Blue),
+      [ZFS_ANON] = A_BOLD | ColorPair(Magenta,Blue),
+      [ZFS_HEADER] = A_BOLD | ColorPair(Yellow,Blue),
+      [ZFS_OTHER] = A_BOLD | ColorPair(Magenta,Blue),
+      [ZFS_COMPRESSED] = A_BOLD | ColorPair(White,Blue),
+      [ZFS_RATIO] = A_BOLD | ColorPair(Magenta,Blue),
    },
    [COLORSCHEME_BLACKNIGHT] = {
       [RESET_COLOR] = ColorPair(Cyan,Black),
@@ -521,12 +581,22 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_NICE] = ColorPair(Blue,Black),
       [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue,Black),
       [CPU_NORMAL] = ColorPair(Green,Black),
-      [CPU_KERNEL] = ColorPair(Red,Black),
+      [CPU_SYSTEM] = ColorPair(Red,Black),
       [CPU_IOWAIT] = ColorPair(Yellow,Black),
       [CPU_IRQ] = A_BOLD | ColorPair(Blue,Black),
       [CPU_SOFTIRQ] = ColorPair(Blue,Black),
       [CPU_STEAL] = ColorPair(Cyan,Black),
       [CPU_GUEST] = ColorPair(Cyan,Black),
+      [PRESSURE_STALL_THREEHUNDRED] = ColorPair(Green,Black),
+      [PRESSURE_STALL_SIXTY] = ColorPair(Green,Black),
+      [PRESSURE_STALL_TEN] = A_BOLD | ColorPair(Green,Black),
+      [ZFS_MFU] = ColorPair(Blue,Black),
+      [ZFS_MRU] = ColorPair(Yellow,Black),
+      [ZFS_ANON] = ColorPair(Magenta,Black),
+      [ZFS_HEADER] = ColorPair(Yellow,Black),
+      [ZFS_OTHER] = ColorPair(Magenta,Black),
+      [ZFS_COMPRESSED] = ColorPair(Blue,Black),
+      [ZFS_RATIO] = ColorPair(Magenta,Black),
    },
    [COLORSCHEME_BROKENGRAY] = { 0 } // dynamically generated.
 };

CRT.h

@@ -110,18 +110,28 @@ typedef enum ColorElements_ {
    CPU_NICE,
    CPU_NICE_TEXT,
    CPU_NORMAL,
-   CPU_KERNEL,
+   CPU_SYSTEM,
    CPU_IOWAIT,
    CPU_IRQ,
    CPU_SOFTIRQ,
    CPU_STEAL,
    CPU_GUEST,
+   PRESSURE_STALL_TEN,
+   PRESSURE_STALL_SIXTY,
+   PRESSURE_STALL_THREEHUNDRED,
+   ZFS_MFU,
+   ZFS_MRU,
+   ZFS_ANON,
+   ZFS_HEADER,
+   ZFS_OTHER,
+   ZFS_COMPRESSED,
+   ZFS_RATIO,
    LAST_COLORELEMENT
 } ColorElements;
 
-void CRT_fatalError(const char* note) __attribute__ ((noreturn));
+extern void CRT_fatalError(const char* note) __attribute__ ((noreturn));
 
-void CRT_handleSIGSEGV(int sgn);
+extern void CRT_handleSIGSEGV(int sgn);
 
 #define KEY_ALT(x) (KEY_F(64 - 26) + (x - 'A'))
 
@@ -140,7 +150,7 @@ extern const char **CRT_treeStr;
 
 extern int CRT_delay;
 
-int* CRT_colors;
+extern int* CRT_colors;
 
 extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
 
@@ -150,21 +160,21 @@ extern int CRT_scrollHAmount;
 
 extern int CRT_scrollWheelVAmount;
 
-char* CRT_termType;
+extern char* CRT_termType;
 
 // TODO move color scheme to Settings, perhaps?
 
 extern int CRT_colorScheme;
 
-void *backtraceArray[128];
+extern void *backtraceArray[128];
 
 #if HAVE_SETUID_ENABLED
 
 #define DIE(msg) do { CRT_done(); fprintf(stderr, msg); exit(1); } while(0)
 
-void CRT_dropPrivileges();
+extern void CRT_dropPrivileges();
 
-void CRT_restorePrivileges();
+extern void CRT_restorePrivileges();
 
 #else
 
@@ -179,18 +189,18 @@ void CRT_restorePrivileges();
 
 // TODO: pass an instance of Settings instead.
 
-void CRT_init(int delay, int colorScheme);
+extern void CRT_init(int delay, int colorScheme);
 
-void CRT_done();
+extern void CRT_done();
 
-void CRT_fatalError(const char* note);
+extern void CRT_fatalError(const char* note);
 
-int CRT_readKey();
+extern int CRT_readKey();
 
-void CRT_disableDelay();
+extern void CRT_disableDelay();
 
-void CRT_enableDelay();
+extern void CRT_enableDelay();
 
-void CRT_setColors(int colorScheme);
+extern void CRT_setColors(int colorScheme);
 
 #endif

CategoriesPanel.h

@@ -24,10 +24,10 @@ typedef struct CategoriesPanel_ {
 } CategoriesPanel;
 
 
-void CategoriesPanel_makeMetersPage(CategoriesPanel* this);
+extern void CategoriesPanel_makeMetersPage(CategoriesPanel* this);
 
 extern PanelClass CategoriesPanel_class;
 
-CategoriesPanel* CategoriesPanel_new(ScreenManager* scr, Settings* settings, Header* header, ProcessList* pl);
+extern CategoriesPanel* CategoriesPanel_new(ScreenManager* scr, Settings* settings, Header* header, ProcessList* pl);
 
 #endif

ChangeLog

@@ -1,15 +1,38 @@
-What's new in version 2.1.1
+What's new in version 2.2.0
 
+* Solaris/Illumos/OpenIndiana support
+  (thanks to Guy M. Broome)
+* -t/--tree flag for starting in tree-view mode
+  (thanks to Daniel Flanagan)
+* macOS: detects High Sierra version to avoid OS bug
+  (thanks to Pierre Malhaire)
+* OpenBSD: read battery data
+  (thanks to @nerd972)
+* Various automake and build improvements
+  (thanks to Kang-Che Sung)
 * Check for pkg-config when building with --enable-delayacct
   (thanks to @florian2833z for the report)
-* BUGFIX: preserve LDFLAGS when building
+* Avoid some bashisms in configure script
-  (thanks to Lance Frederickson for the report)
+  (thanks to Jesin)
-* BUGFIX: fix issue with small terminals
+* Use CFLAGS from ncurses*-config if present
-  (thanks to Daniel Elf for the report)
+  (thanks to Michael Klein)
+* Header generator supports non-UTF-8 environments
+  (thanks to @volkov-am)
+* Linux: changed detection of kernel threads
+* Collapse current subtree pressing Backspace
+* BUGFIX: fix behavior of SYSCR column
+  (thanks to Marc Kleine-Budde)
+* BUGFIX: obtain exit code of lsof correctly
+  (thanks to @wangqr)
 * BUGFIX: fix crash with particular keycodes
   (thanks to Wellington Torrejais da Silva for the report)
+* BUGFIX: fix issue with small terminals
+  (thanks to Daniel Elf for the report)
 * BUGFIX: fix terminal color issues
   (thanks to Kang-Che Sung for the report)
+* BUGFIX: preserve LDFLAGS when building
+  (thanks to Lance Frederickson for the report)
+* BUGFIX: fixed overflow for systems with >= 100 signals
 
 What's new in version 2.1.0
 

CheckItem.h

@@ -21,12 +21,12 @@ typedef struct CheckItem_ {
 
 extern ObjectClass CheckItem_class;
 
-CheckItem* CheckItem_newByRef(char* text, bool* ref);
+extern CheckItem* CheckItem_newByRef(char* text, bool* ref);
 
-CheckItem* CheckItem_newByVal(char* text, bool value);
+extern CheckItem* CheckItem_newByVal(char* text, bool value);
 
-void CheckItem_set(CheckItem* this, bool value);
+extern void CheckItem_set(CheckItem* this, bool value);
 
-bool CheckItem_get(CheckItem* this);
+extern bool CheckItem_get(CheckItem* this);
 
 #endif

ColorsPanel.h

@@ -29,6 +29,6 @@ typedef struct ColorsPanel_ {
 
 extern PanelClass ColorsPanel_class;
 
-ColorsPanel* ColorsPanel_new(Settings* settings, ScreenManager* scr);
+extern ColorsPanel* ColorsPanel_new(Settings* settings, ScreenManager* scr);
 
 #endif

ColumnsPanel.h

@@ -22,11 +22,11 @@ typedef struct ColumnsPanel_ {
 
 extern PanelClass ColumnsPanel_class;
 
-ColumnsPanel* ColumnsPanel_new(Settings* settings);
+extern ColumnsPanel* ColumnsPanel_new(Settings* settings);
 
-int ColumnsPanel_fieldNameToIndex(const char* name);
+extern int ColumnsPanel_fieldNameToIndex(const char* name);
 
-void ColumnsPanel_update(Panel* super);
+extern void ColumnsPanel_update(Panel* super);
 
 
 #endif

DisplayOptionsPanel.c

@@ -97,5 +97,8 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Count CPUs from 0 instead of 1"), &(settings->countCPUsFromZero)));
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Update process names on every refresh"), &(settings->updateProcessNames)));
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Add guest time in CPU meter percentage"), &(settings->accountGuestInCPUMeter)));
+   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Also show CPU percentage numerically"), &(settings->showCPUUsage)));
+   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Also show CPU frequency"), &(settings->showCPUFrequency)));
+   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Enable the mouse"), &(settings->enableMouse)));
    return this;
 }

DisplayOptionsPanel.h

@@ -23,6 +23,6 @@ typedef struct DisplayOptionsPanel_ {
 
 extern PanelClass DisplayOptionsPanel_class;
 
-DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager* scr);
+extern DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager* scr);
 
 #endif

EnvScreen.h

@@ -11,12 +11,12 @@ typedef struct EnvScreen_ {
 
 extern InfoScreenClass EnvScreen_class;
 
-EnvScreen* EnvScreen_new(Process* process);
+extern EnvScreen* EnvScreen_new(Process* process);
 
-void EnvScreen_delete(Object* this);
+extern void EnvScreen_delete(Object* this);
 
-void EnvScreen_draw(InfoScreen* this);
+extern void EnvScreen_draw(InfoScreen* this);
 
-void EnvScreen_scan(InfoScreen* this);
+extern void EnvScreen_scan(InfoScreen* this);
 
 #endif

FunctionBar.h

@@ -22,18 +22,18 @@ typedef struct FunctionBar_ {
 
 
 
-FunctionBar* FunctionBar_newEnterEsc(const char* enter, const char* esc);
+extern FunctionBar* FunctionBar_newEnterEsc(const char* enter, const char* esc);
 
-FunctionBar* FunctionBar_new(const char* const* functions, const char* const* keys, const int* events);
+extern FunctionBar* FunctionBar_new(const char* const* functions, const char* const* keys, const int* events);
 
-void FunctionBar_delete(FunctionBar* this);
+extern void FunctionBar_delete(FunctionBar* this);
 
-void FunctionBar_setLabel(FunctionBar* this, int event, const char* text);
+extern void FunctionBar_setLabel(FunctionBar* this, int event, const char* text);
 
-void FunctionBar_draw(const FunctionBar* this, char* buffer);
+extern void FunctionBar_draw(const FunctionBar* this, char* buffer);
 
-void FunctionBar_drawAttr(const FunctionBar* this, char* buffer, int attr);
+extern void FunctionBar_drawAttr(const FunctionBar* this, char* buffer, int attr);
 
-int FunctionBar_synthesizeEvent(const FunctionBar* this, int pos);
+extern int FunctionBar_synthesizeEvent(const FunctionBar* this, int pos);
 
 #endif

Hashtable.h

@@ -30,20 +30,20 @@ struct Hashtable_ {
 
 #ifdef DEBUG
 
-int Hashtable_count(Hashtable* this);
+extern int Hashtable_count(Hashtable* this);
 
 #endif
 
-Hashtable* Hashtable_new(int size, bool owner);
+extern Hashtable* Hashtable_new(int size, bool owner);
 
-void Hashtable_delete(Hashtable* this);
+extern void Hashtable_delete(Hashtable* this);
 
-void Hashtable_put(Hashtable* this, unsigned int key, void* value);
+extern void Hashtable_put(Hashtable* this, unsigned int key, void* value);
 
-void* Hashtable_remove(Hashtable* this, unsigned int key);
+extern void* Hashtable_remove(Hashtable* this, unsigned int key);
 
 extern void* Hashtable_get(Hashtable* this, unsigned int key);
 
-void Hashtable_foreach(Hashtable* this, Hashtable_PairFunction f, void* userData);
+extern void Hashtable_foreach(Hashtable* this, Hashtable_PairFunction f, void* userData);
 
 #endif

Header.c

@@ -120,6 +120,8 @@ MeterModeId Header_addMeterByName(Header* this, char* name, int column) {
          break;
       }
    }
+   if (paren)
+      *paren = '(';
    return mode;
 }
 

Header.h

@@ -31,30 +31,30 @@ typedef struct Header_ {
 #define Header_forEachColumn(this_, i_) for (int (i_)=0; (i_) < (this_)->nrColumns; ++(i_))
 #endif
 
-Header* Header_new(struct ProcessList_* pl, Settings* settings, int nrColumns);
+extern Header* Header_new(struct ProcessList_* pl, Settings* settings, int nrColumns);
 
-void Header_delete(Header* this);
+extern void Header_delete(Header* this);
 
-void Header_populateFromSettings(Header* this);
+extern void Header_populateFromSettings(Header* this);
 
-void Header_writeBackToSettings(const Header* this);
+extern void Header_writeBackToSettings(const Header* this);
 
-MeterModeId Header_addMeterByName(Header* this, char* name, int column);
+extern MeterModeId Header_addMeterByName(Header* this, char* name, int column);
 
-void Header_setMode(Header* this, int i, MeterModeId mode, int column);
+extern void Header_setMode(Header* this, int i, MeterModeId mode, int column);
 
-Meter* Header_addMeterByClass(Header* this, MeterClass* type, int param, int column);
+extern Meter* Header_addMeterByClass(Header* this, MeterClass* type, int param, int column);
 
-int Header_size(Header* this, int column);
+extern int Header_size(Header* this, int column);
 
-char* Header_readMeterName(Header* this, int i, int column);
+extern char* Header_readMeterName(Header* this, int i, int column);
 
-MeterModeId Header_readMeterMode(Header* this, int i, int column);
+extern MeterModeId Header_readMeterMode(Header* this, int i, int column);
 
-void Header_reinit(Header* this);
+extern void Header_reinit(Header* this);
 
-void Header_draw(const Header* this);
+extern void Header_draw(const Header* this);
 
-int Header_calculateHeight(Header* this);
+extern int Header_calculateHeight(Header* this);
 
 #endif

INSTALL

@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell command `./configure && make && make install'
-should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
-
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.

IncSet.c

@@ -52,6 +52,10 @@ static void IncMode_reset(IncMode* mode) {
    mode->buffer[0] = 0;
 }
 
+void IncSet_reset(IncSet* this, IncType type) {
+   IncMode_reset(&this->modes[type]);
+}
+
 static const char* const searchFunctions[] = {"Next  ", "Cancel ", " Search: ", NULL};
 static const char* const searchKeys[] = {"F3", "Esc", "  "};
 static int searchEvents[] = {KEY_F(3), 27, ERR};
@@ -132,6 +136,30 @@ static bool search(IncMode* mode, Panel* panel, IncMode_GetPanelValue getPanelVa
    return found;
 }
 
+static bool IncMode_find(IncMode* mode, Panel* panel, IncMode_GetPanelValue getPanelValue, int step) {
+   int size = Panel_size(panel);
+   int here = Panel_getSelectedIndex(panel);
+   int i = here;
+   for(;;) {
+      i+=step;
+      if (i == size) i = 0;
+      if (i == -1) i = size - 1;
+      if (i == here) return false;
+      if (String_contains_i(getPanelValue(panel, i), mode->buffer)) {
+         Panel_setSelected(panel, i);
+         return true;
+      }
+   }
+}
+
+bool IncSet_next(IncSet* this, IncType type, Panel* panel, IncMode_GetPanelValue getPanelValue) {
+   return IncMode_find(&this->modes[type], panel, getPanelValue, 1);
+}
+
+bool IncSet_prev(IncSet* this, IncType type, Panel* panel, IncMode_GetPanelValue getPanelValue) {
+   return IncMode_find(&this->modes[type], panel, getPanelValue, -1);
+}
+
 bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines) {
    if (ch == ERR)
       return true;
@@ -141,17 +169,7 @@ bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue
    bool doSearch = true;
    if (ch == KEY_F(3)) {
       if (size == 0) return true;
-      int here = Panel_getSelectedIndex(panel);
+      IncMode_find(mode, panel, getPanelValue, 1);
-      int i = here;
-      for(;;) {
-         i++;
-         if (i == size) i = 0;
-         if (i == here) break;
-         if (String_contains_i(getPanelValue(panel, i), mode->buffer)) {
-            Panel_setSelected(panel, i);
-            break;
-         }
-      }
       doSearch = false;
    } else if (ch < 255 && isprint((char)ch)) {
       if (mode->index < INCMODE_MAX) {
@@ -187,7 +205,9 @@ bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue
             IncMode_reset(mode);
          }
       } else {
-         IncMode_reset(mode);
+         if (ch == 27) {
+            IncMode_reset(mode);
+         }
       }
       this->active = NULL;
       Panel_setDefaultBar(panel);

IncSet.h

@@ -41,18 +41,24 @@ typedef struct IncSet_ {
 typedef const char* (*IncMode_GetPanelValue)(Panel*, int);
 
 
-IncSet* IncSet_new(FunctionBar* bar);
+extern void IncSet_reset(IncSet* this, IncType type);
 
-void IncSet_delete(IncSet* this);
+extern IncSet* IncSet_new(FunctionBar* bar);
 
-bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines);
+extern void IncSet_delete(IncSet* this);
 
-const char* IncSet_getListItemValue(Panel* panel, int i);
+extern bool IncSet_next(IncSet* this, IncType type, Panel* panel, IncMode_GetPanelValue getPanelValue);
 
-void IncSet_activate(IncSet* this, IncType type, Panel* panel);
+extern bool IncSet_prev(IncSet* this, IncType type, Panel* panel, IncMode_GetPanelValue getPanelValue);
 
-void IncSet_drawBar(IncSet* this);
+extern bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines);
 
-int IncSet_synthesizeEvent(IncSet* this, int x);
+extern const char* IncSet_getListItemValue(Panel* panel, int i);
+
+extern void IncSet_activate(IncSet* this, IncType type, Panel* panel);
+
+extern void IncSet_drawBar(IncSet* this);
+
+extern int IncSet_synthesizeEvent(IncSet* this, int x);
 
 #endif

InfoScreen.c

@@ -115,8 +115,9 @@ void InfoScreen_run(InfoScreen* this) {
 
       Panel_draw(panel, true);
 
-      if (this->inc->active)
+      if (this->inc->active) {
-         move(LINES-1, CRT_cursorX);
+         (void) move(LINES-1, CRT_cursorX);
+      }
       set_escdelay(25);
       int ch = getch();
 
@@ -130,12 +131,14 @@ void InfoScreen_run(InfoScreen* this) {
       if (ch == KEY_MOUSE) {
          MEVENT mevent;
          int ok = getmouse(&mevent);
-         if (ok == OK)
+         if (ok == OK) {
             if (mevent.y >= panel->y && mevent.y < LINES - 1) {
                Panel_setSelected(panel, mevent.y - panel->y + panel->scrollV);
                ch = 0;
-            } if (mevent.y == LINES - 1)
+            } else if (mevent.y == LINES - 1) {
                ch = IncSet_synthesizeEvent(this->inc, mevent.x);
+            }
+	 }
       }
 
       if (this->inc->active) {

InfoScreen.h

@@ -38,16 +38,16 @@ struct InfoScreen_ {
    Vector* lines;
 };
 
-InfoScreen* InfoScreen_init(InfoScreen* this, Process* process, FunctionBar* bar, int height, char* panelHeader);
+extern InfoScreen* InfoScreen_init(InfoScreen* this, Process* process, FunctionBar* bar, int height, char* panelHeader);
 
-InfoScreen* InfoScreen_done(InfoScreen* this);
+extern InfoScreen* InfoScreen_done(InfoScreen* this);
 
-void InfoScreen_drawTitled(InfoScreen* this, char* fmt, ...);
+extern void InfoScreen_drawTitled(InfoScreen* this, char* fmt, ...);
 
-void InfoScreen_addLine(InfoScreen* this, const char* line);
+extern void InfoScreen_addLine(InfoScreen* this, const char* line);
 
-void InfoScreen_appendLine(InfoScreen* this, const char* line);
+extern void InfoScreen_appendLine(InfoScreen* this, const char* line);
 
-void InfoScreen_run(InfoScreen* this);
+extern void InfoScreen_run(InfoScreen* this);
 
 #endif

ListItem.h

@@ -21,13 +21,13 @@ typedef struct ListItem_ {
 
 extern ObjectClass ListItem_class;
 
-ListItem* ListItem_new(const char* value, int key);
+extern ListItem* ListItem_new(const char* value, int key);
 
-void ListItem_append(ListItem* this, const char* text);
+extern void ListItem_append(ListItem* this, const char* text);
 
-const char* ListItem_getRef(ListItem* this);
+extern const char* ListItem_getRef(ListItem* this);
 
-long ListItem_compare(const void* cast1, const void* cast2);
+extern long ListItem_compare(const void* cast1, const void* cast2);
 
 
 #endif

MainPanel.c

@@ -1,6 +1,7 @@
 /*
 htop - ColumnsPanel.c
 (C) 2004-2015 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -25,13 +26,13 @@ typedef struct MainPanel_ {
    pid_t pidSearch;
 } MainPanel;
 
-typedef bool(*MainPanel_ForeachProcessFn)(Process*, size_t);
+typedef bool(*MainPanel_ForeachProcessFn)(Process*, Arg);
 
 #define MainPanel_getFunctionBar(this_) (((Panel*)(this_))->defaultBar)
 
 }*/
 
-static const char* const MainFunctions[]  = {"Help  ", "Setup ", "Search", "Filter", "Tree  ", "SortBy", "Nice -", "Nice +", "Kill  ", "Quit  ", NULL};
+static const char* const MainFunctions[]  = {"Help   ", "Setup  ", "Search ", "Filter ", "Tree   ", "SortBy ", "Nice - ", "Nice + ", "Kill   ", "Quit   ", NULL};
 
 void MainPanel_updateTreeFunctions(MainPanel* this, bool mode) {
    FunctionBar* bar = MainPanel_getFunctionBar(this);
@@ -148,7 +149,7 @@ const char* MainPanel_getValue(MainPanel* this, int i) {
    return "";
 }
 
-bool MainPanel_foreachProcess(MainPanel* this, MainPanel_ForeachProcessFn fn, size_t arg, bool* wasAnyTagged) {
+bool MainPanel_foreachProcess(MainPanel* this, MainPanel_ForeachProcessFn fn, Arg arg, bool* wasAnyTagged) {
    Panel* super = (Panel*) this;
    bool ok = true;
    bool anyTagged = false;

MainPanel.h

@@ -5,6 +5,7 @@
 /*
 htop - ColumnsPanel.h
 (C) 2004-2015 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -21,27 +22,27 @@ typedef struct MainPanel_ {
    pid_t pidSearch;
 } MainPanel;
 
-typedef bool(*MainPanel_ForeachProcessFn)(Process*, size_t);
+typedef bool(*MainPanel_ForeachProcessFn)(Process*, Arg);
 
 #define MainPanel_getFunctionBar(this_) (((Panel*)(this_))->defaultBar)
 
 
-void MainPanel_updateTreeFunctions(MainPanel* this, bool mode);
+extern void MainPanel_updateTreeFunctions(MainPanel* this, bool mode);
 
-void MainPanel_pidSearch(MainPanel* this, int ch);
+extern void MainPanel_pidSearch(MainPanel* this, int ch);
 
-int MainPanel_selectedPid(MainPanel* this);
+extern int MainPanel_selectedPid(MainPanel* this);
 
-const char* MainPanel_getValue(MainPanel* this, int i);
+extern const char* MainPanel_getValue(MainPanel* this, int i);
 
-bool MainPanel_foreachProcess(MainPanel* this, MainPanel_ForeachProcessFn fn, size_t arg, bool* wasAnyTagged);
+extern bool MainPanel_foreachProcess(MainPanel* this, MainPanel_ForeachProcessFn fn, Arg arg, bool* wasAnyTagged);
 
 extern PanelClass MainPanel_class;
 
-MainPanel* MainPanel_new();
+extern MainPanel* MainPanel_new();
 
-void MainPanel_setState(MainPanel* this, State* state);
+extern void MainPanel_setState(MainPanel* this, State* state);
 
-void MainPanel_delete(Object* object);
+extern void MainPanel_delete(Object* object);
 
 #endif

Makefile.am

@@ -12,8 +12,8 @@ applications_DATA = htop.desktop
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = htop.png
 
-htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"
+AM_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"
-htop_LDFLAGS = 
+AM_LDFLAGS =
 AM_CPPFLAGS = -DNDEBUG
 
 myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
@@ -36,64 +36,182 @@ TasksMeter.h UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h \
 AffinityPanel.h HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h \
 EnvScreen.h InfoScreen.h XAlloc.h
 
-if HTOP_LINUX
+all_platform_headers =
-htop_CFLAGS += -rdynamic 
-myhtopplatsources = linux/Platform.c linux/IOPriorityPanel.c linux/IOPriority.c \
-linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c
 
-myhtopplatheaders = linux/Platform.h linux/IOPriorityPanel.h linux/IOPriority.h \
+# Linux
-linux/LinuxProcess.h linux/LinuxProcessList.h linux/LinuxCRT.h linux/Battery.h
+# -----
+
+linux_platform_headers = \
+	linux/Platform.h \
+	linux/IOPriorityPanel.h \
+	linux/IOPriority.h \
+	linux/LinuxProcess.h \
+	linux/LinuxProcessList.h \
+	linux/LinuxCRT.h \
+	linux/Battery.h \
+	linux/PressureStallMeter.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsCompressedArcMeter.h \
+	zfs/ZfsArcStats.h
+
+all_platform_headers += $(linux_platform_headers)
+
+if HTOP_LINUX
+AM_LDFLAGS += -rdynamic
+myhtopplatsources = linux/Platform.c linux/IOPriorityPanel.c linux/IOPriority.c \
+linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c \
+linux/PressureStallMeter.c \
+zfs/ZfsArcMeter.c zfs/ZfsCompressedArcMeter.c zfs/ZfsArcStats.c
+
+myhtopplatheaders = $(linux_platform_headers)
 endif
 
+# FreeBSD
+# -------
+
+freebsd_platform_headers = \
+	freebsd/Platform.h \
+	freebsd/FreeBSDProcessList.h \
+	freebsd/FreeBSDProcess.h \
+	freebsd/FreeBSDCRT.h \
+	freebsd/Battery.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsCompressedArcMeter.h \
+	zfs/ZfsArcStats.h \
+	zfs/openzfs_sysctl.h
+
+all_platform_headers += $(freebsd_platform_headers)
+
 if HTOP_FREEBSD
 myhtopplatsources = freebsd/Platform.c freebsd/FreeBSDProcessList.c \
-freebsd/FreeBSDProcess.c freebsd/FreeBSDCRT.c freebsd/Battery.c
+freebsd/FreeBSDProcess.c freebsd/FreeBSDCRT.c freebsd/Battery.c \
+zfs/ZfsArcMeter.c zfs/ZfsCompressedArcMeter.c zfs/ZfsArcStats.c zfs/openzfs_sysctl.c
 
-myhtopplatheaders = freebsd/Platform.h freebsd/FreeBSDProcessList.h \
+myhtopplatheaders = $(freebsd_platform_headers)
-freebsd/FreeBSDProcess.h freebsd/FreeBSDCRT.h freebsd/Battery.h
 endif
 
+# DragonFlyBSD
+# ------------
+
+dragonflybsd_platform_headers = \
+	dragonflybsd/Platform.h \
+	dragonflybsd/DragonFlyBSDProcessList.h \
+	dragonflybsd/DragonFlyBSDProcess.h \
+	dragonflybsd/DragonFlyBSDCRT.h \
+	dragonflybsd/Battery.h
+
+all_platform_headers += $(dragonflybsd_platform_headers)
+
 if HTOP_DRAGONFLYBSD
-htop_LDFLAGS += -lkvm -lkinfo -lexecinfo
+AM_LDFLAGS += -lkvm -lkinfo -lexecinfo
 myhtopplatsources = dragonflybsd/Platform.c dragonflybsd/DragonFlyBSDProcessList.c \
 dragonflybsd/DragonFlyBSDProcess.c dragonflybsd/DragonFlyBSDCRT.c dragonflybsd/Battery.c
 
-myhtopplatheaders = dragonflybsd/Platform.h dragonflybsd/DragonFlyBSDProcessList.h \
+myhtopplatheaders = $(dragonflybsd_platform_headers)
-dragonflybsd/DragonFlyBSDProcess.h dragonflybsd/DragonFlyBSDCRT.h dragonflybsd/Battery.h
 endif
 
+# OpenBSD
+# -------
+
+openbsd_platform_headers = \
+	openbsd/Platform.h \
+	openbsd/OpenBSDProcessList.h \
+	openbsd/OpenBSDProcess.h \
+	openbsd/OpenBSDCRT.h \
+	openbsd/Battery.h
+
+all_platform_headers += $(openbsd_platform_headers)
+
 if HTOP_OPENBSD
 myhtopplatsources = openbsd/Platform.c openbsd/OpenBSDProcessList.c \
 openbsd/OpenBSDProcess.c openbsd/OpenBSDCRT.c openbsd/Battery.c
 
-myhtopplatheaders = openbsd/Platform.h openbsd/OpenBSDProcessList.h \
+myhtopplatheaders = $(openbsd_platform_headers)
-openbsd/OpenBSDProcess.h openbsd/OpenBSDCRT.h openbsd/Battery.h
 endif
 
+# Darwin
+# ------
+
+darwin_platform_headers = \
+	darwin/Platform.h \
+	darwin/DarwinProcess.h \
+	darwin/DarwinProcessList.h \
+	darwin/DarwinCRT.h \
+	darwin/Battery.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsCompressedArcMeter.h \
+	zfs/ZfsArcStats.h \
+	zfs/openzfs_sysctl.h
+
+all_platform_headers += $(darwin_platform_headers)
+
 if HTOP_DARWIN
-htop_LDFLAGS += -framework IOKit -framework CoreFoundation
+AM_LDFLAGS += -framework IOKit -framework CoreFoundation
 myhtopplatsources = darwin/Platform.c darwin/DarwinProcess.c \
-darwin/DarwinProcessList.c darwin/DarwinCRT.c darwin/Battery.c
+darwin/DarwinProcessList.c darwin/DarwinCRT.c darwin/Battery.c \
+zfs/ZfsArcMeter.c zfs/ZfsCompressedArcMeter.c zfs/ZfsArcStats.c zfs/openzfs_sysctl.c
 
-myhtopplatheaders = darwin/Platform.h darwin/DarwinProcess.h \
+myhtopplatheaders = $(darwin_platform_headers)
-darwin/DarwinProcessList.h darwin/DarwinCRT.h darwin/Battery.h
 endif
 
+# Solaris
+# -------
+
+solaris_platform_headers = \
+	solaris/Platform.h \
+	solaris/SolarisProcess.h \
+	solaris/SolarisProcessList.h \
+	solaris/SolarisCRT.h \
+	solaris/Battery.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsCompressedArcMeter.h \
+	zfs/ZfsArcStats.h
+
+all_platform_headers += $(solaris_platform_headers)
+
+if HTOP_SOLARIS
+myhtopplatsources = solaris/Platform.c \
+solaris/SolarisProcess.c solaris/SolarisProcessList.c \
+solaris/SolarisCRT.c solaris/Battery.c \
+zfs/ZfsArcMeter.c zfs/ZfsCompressedArcMeter.c zfs/ZfsArcStats.c
+
+myhtopplatheaders = $(solaris_platform_headers)
+endif
+
+# Unsupported
+# -----------
+
+unsupported_platform_headers = \
+	unsupported/Platform.h \
+	unsupported/UnsupportedProcess.h \
+	unsupported/UnsupportedProcessList.h \
+	unsupported/UnsupportedCRT.h \
+	unsupported/Battery.h
+
+all_platform_headers += $(unsupported_platform_headers)
+
 if HTOP_UNSUPPORTED
 myhtopplatsources = unsupported/Platform.c \
 unsupported/UnsupportedProcess.c unsupported/UnsupportedProcessList.c \
 unsupported/UnsupportedCRT.c unsupported/Battery.c
 
-myhtopplatheaders = unsupported/Platform.h \
+myhtopplatheaders = $(unsupported_platform_headers)
-unsupported/UnsupportedProcess.h unsupported/UnsupportedProcessList.h \
-unsupported/UnsupportedCRT.h unsupported/Battery.h
 endif
 
+# ----
+
 SUFFIXES = .h
 
 BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
 htop_SOURCES  = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
 
+.PHONY: htop-headers clean-htop-headers
+
+htop-headers: $(myhtopheaders) $(all_platform_headers)
+
+clean-htop-headers:
+	-rm -f $(myhtopheaders) $(all_platform_headers)
+
 target:
 	echo $(htop_SOURCES)
 
@@ -112,6 +230,13 @@ coverage:
 cppcheck:
 	cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS
 
+dist-hook: $(top_distdir)/configure
+	@if grep 'pkg_m4_absent' '$(top_distdir)/configure'; then \
+	   echo 'configure is generated without pkg.m4. Please supply pkg.m4 and run ./autogen.sh to rebuild the configure script.'>&2; \
+	   (exit 1); \
+	else :; \
+	fi
+
 .PHONY: lcov
 
 lcov:

Meter.c

@@ -359,7 +359,7 @@ static int GraphMeterMode_pixPerRow;
 static void GraphMeterMode_draw(Meter* this, int x, int y, int w) {
 
    if (!this->drawData) this->drawData = xCalloc(1, sizeof(GraphData));
-    GraphData* data = (GraphData*) this->drawData;
+   GraphData* data = (GraphData*) this->drawData;
    const int nValues = METER_BUFFER_LEN;
 
 #ifdef HAVE_LIBNCURSESW
@@ -404,7 +404,7 @@ static void GraphMeterMode_draw(Meter* this, int x, int y, int w) {
       k = -i/2;
       i = 0;
    }
-   for (; i < nValues; i+=2, k++) {
+   for (; i < nValues - 1; i+=2, k++) {
       int pix = GraphMeterMode_pixPerRow * GRAPH_HEIGHT;
       int v1 = CLAMP((int) lround(data->values[i] * pix), 1, pix);
       int v2 = CLAMP((int) lround(data->values[i+1] * pix), 1, pix);
@@ -523,6 +523,9 @@ MeterMode* Meter_modes[] = {
 
 static void BlankMeter_updateValues(Meter* this, char* buffer, int size) {
    (void) this; (void) buffer; (void) size;
+   if (size > 0) {
+      *buffer = 0;
+   }
 }
 
 static void BlankMeter_display(Object* cast, RichString* out) {

Meter.h

@@ -109,17 +109,17 @@ typedef struct GraphData_ {
 
 extern MeterClass Meter_class;
 
-Meter* Meter_new(struct ProcessList_* pl, int param, MeterClass* type);
+extern Meter* Meter_new(struct ProcessList_* pl, int param, MeterClass* type);
 
-int Meter_humanUnit(char* buffer, unsigned long int value, int size);
+extern int Meter_humanUnit(char* buffer, unsigned long int value, int size);
 
-void Meter_delete(Object* cast);
+extern void Meter_delete(Object* cast);
 
-void Meter_setCaption(Meter* this, const char* caption);
+extern void Meter_setCaption(Meter* this, const char* caption);
 
-void Meter_setMode(Meter* this, int modeIndex);
+extern void Meter_setMode(Meter* this, int modeIndex);
 
-ListItem* Meter_toListItem(Meter* this, bool moving);
+extern ListItem* Meter_toListItem(Meter* this, bool moving);
 
 /* ---------- TextMeterMode ---------- */
 

MetersPanel.h

@@ -34,10 +34,10 @@ struct MetersPanel_ {
 // In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
 // considered "Ambiguous characters".
 
-void MetersPanel_setMoving(MetersPanel* this, bool moving);
+extern void MetersPanel_setMoving(MetersPanel* this, bool moving);
 
 extern PanelClass MetersPanel_class;
 
-MetersPanel* MetersPanel_new(Settings* settings, const char* header, Vector* meters, ScreenManager* scr);
+extern MetersPanel* MetersPanel_new(Settings* settings, const char* header, Vector* meters, ScreenManager* scr);
 
 #endif

Object.c

@@ -1,6 +1,7 @@
 /*
 htop - Object.c
 (C) 2004-2012 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -40,6 +41,11 @@ struct Object_ {
    ObjectClass* klass;
 };
 
+typedef union {
+   int i;
+   void* v;
+} Arg;
+
 }*/
 
 ObjectClass Object_class = {

Object.h

@@ -5,6 +5,7 @@
 /*
 htop - Object.h
 (C) 2004-2012 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -41,12 +42,17 @@ struct Object_ {
    ObjectClass* klass;
 };
 
+typedef union {
+   int i;
+   void* v;
+} Arg;
+
 
 extern ObjectClass Object_class;
 
 #ifdef DEBUG
 
-bool Object_isA(Object* o, const ObjectClass* klass);
+extern bool Object_isA(Object* o, const ObjectClass* klass);
 
 #endif
 

OpenFilesScreen.c

@@ -76,16 +76,35 @@ void OpenFilesScreen_draw(InfoScreen* this) {
 }
 
 static OpenFiles_ProcessData* OpenFilesScreen_getProcessData(pid_t pid) {
-   char command[1025];
+   char buffer[1025];
-   xSnprintf(command, 1024, "lsof -P -p %d -F 2> /dev/null", pid);
+   xSnprintf(buffer, 1024, "%d", pid);
-   FILE* fd = popen(command, "r");
    OpenFiles_ProcessData* pdata = xCalloc(1, sizeof(OpenFiles_ProcessData));
    OpenFiles_FileData* fdata = NULL;
    OpenFiles_Data* item = &(pdata->data);
-   if (!fd) {
+   int fdpair[2];
-      pdata->error = 127;
+   if (pipe(fdpair) == -1) {
+      pdata->error = 1;
       return pdata;
    }
+   pid_t child = fork();
+   if (child == -1) {
+      pdata->error = 1;
+      return pdata;
+   }
+   if (child == 0) {
+      close(fdpair[0]);
+      dup2(fdpair[1], STDOUT_FILENO);
+      close(fdpair[1]);
+      int fdnull = open("/dev/null", O_WRONLY);
+      if (fdnull < 0)
+         exit(1);
+      dup2(fdnull, STDERR_FILENO);
+      close(fdnull);
+      execlp("lsof", "lsof", "-P", "-p", buffer, "-F", NULL);
+      exit(127);
+   }
+   close(fdpair[1]);
+   FILE* fd = fdopen(fdpair[0], "r");
    for (;;) {
       char* line = String_readLine(fd);
       if (!line) {
@@ -105,7 +124,16 @@ static OpenFiles_ProcessData* OpenFilesScreen_getProcessData(pid_t pid) {
       item->data[cmd] = xStrdup(line + 1);
       free(line);
    }
-   pdata->error = pclose(fd);
+   fclose(fd);
+   int wstatus;
+   if (waitpid(child, &wstatus, 0) == -1) {
+      pdata->error = 1;
+      return pdata;
+   }
+   if (!WIFEXITED(wstatus))
+      pdata->error = 1;
+   else
+      pdata->error = WEXITSTATUS(wstatus);
    return pdata;
 }
 
@@ -130,7 +158,7 @@ void OpenFilesScreen_scan(InfoScreen* this) {
          char** data = fdata->data.data;
          int lenN = data['n'] ? strlen(data['n']) : 0;
          int sizeEntry = 5 + 7 + 10 + 10 + 10 + lenN + 5 /*spaces*/ + 1 /*null*/;
-         char* entry = xMalloc(sizeEntry);
+         char entry[sizeEntry];
          xSnprintf(entry, sizeEntry, "%5.5s %7.7s %10.10s %10.10s %10.10s %s",
             data['f'] ? data['f'] : "",
             data['t'] ? data['t'] : "",

OpenFilesScreen.h

@@ -34,12 +34,12 @@ typedef struct OpenFilesScreen_ {
 
 extern InfoScreenClass OpenFilesScreen_class;
 
-OpenFilesScreen* OpenFilesScreen_new(Process* process);
+extern OpenFilesScreen* OpenFilesScreen_new(Process* process);
 
-void OpenFilesScreen_delete(Object* this);
+extern void OpenFilesScreen_delete(Object* this);
 
-void OpenFilesScreen_draw(InfoScreen* this);
+extern void OpenFilesScreen_draw(InfoScreen* this);
 
-void OpenFilesScreen_scan(InfoScreen* this);
+extern void OpenFilesScreen_scan(InfoScreen* this);
 
 #endif

Panel.h

@@ -75,52 +75,52 @@ struct Panel_ {
 
 extern PanelClass Panel_class;
 
-Panel* Panel_new(int x, int y, int w, int h, bool owner, ObjectClass* type, FunctionBar* fuBar);
+extern Panel* Panel_new(int x, int y, int w, int h, bool owner, ObjectClass* type, FunctionBar* fuBar);
 
-void Panel_delete(Object* cast);
+extern void Panel_delete(Object* cast);
 
-void Panel_init(Panel* this, int x, int y, int w, int h, ObjectClass* type, bool owner, FunctionBar* fuBar);
+extern void Panel_init(Panel* this, int x, int y, int w, int h, ObjectClass* type, bool owner, FunctionBar* fuBar);
 
-void Panel_done(Panel* this);
+extern void Panel_done(Panel* this);
 
-void Panel_setSelectionColor(Panel* this, int color);
+extern void Panel_setSelectionColor(Panel* this, int color);
 
-RichString* Panel_getHeader(Panel* this);
+extern RichString* Panel_getHeader(Panel* this);
 
 extern void Panel_setHeader(Panel* this, const char* header);
 
-void Panel_move(Panel* this, int x, int y);
+extern void Panel_move(Panel* this, int x, int y);
 
-void Panel_resize(Panel* this, int w, int h);
+extern void Panel_resize(Panel* this, int w, int h);
 
-void Panel_prune(Panel* this);
+extern void Panel_prune(Panel* this);
 
-void Panel_add(Panel* this, Object* o);
+extern void Panel_add(Panel* this, Object* o);
 
-void Panel_insert(Panel* this, int i, Object* o);
+extern void Panel_insert(Panel* this, int i, Object* o);
 
-void Panel_set(Panel* this, int i, Object* o);
+extern void Panel_set(Panel* this, int i, Object* o);
 
-Object* Panel_get(Panel* this, int i);
+extern Object* Panel_get(Panel* this, int i);
 
-Object* Panel_remove(Panel* this, int i);
+extern Object* Panel_remove(Panel* this, int i);
 
-Object* Panel_getSelected(Panel* this);
+extern Object* Panel_getSelected(Panel* this);
 
-void Panel_moveSelectedUp(Panel* this);
+extern void Panel_moveSelectedUp(Panel* this);
 
-void Panel_moveSelectedDown(Panel* this);
+extern void Panel_moveSelectedDown(Panel* this);
 
-int Panel_getSelectedIndex(Panel* this);
+extern int Panel_getSelectedIndex(Panel* this);
 
-int Panel_size(Panel* this);
+extern int Panel_size(Panel* this);
 
-void Panel_setSelected(Panel* this, int selected);
+extern void Panel_setSelected(Panel* this, int selected);
 
-void Panel_draw(Panel* this, bool focus);
+extern void Panel_draw(Panel* this, bool focus);
 
-bool Panel_onKey(Panel* this, int key);
+extern bool Panel_onKey(Panel* this, int key);
 
-HandlerResult Panel_selectByTyping(Panel* this, int ch);
+extern HandlerResult Panel_selectByTyping(Panel* this, int ch);
 
 #endif

Process.c

@@ -1,6 +1,7 @@
 /*
 htop - Process.c
 (C) 2004-2015 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -8,6 +9,8 @@ in the source distribution for its full text.
 #include "Process.h"
 #include "Settings.h"
 
+#include "config.h"
+
 #include "CRT.h"
 #include "StringUtils.h"
 #include "RichString.h"
@@ -28,6 +31,11 @@ in the source distribution for its full text.
 #include <time.h>
 #include <assert.h>
 #include <math.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#endif
 
 #ifdef __ANDROID__
 #define SYS_ioprio_get __NR_ioprio_get
@@ -172,6 +180,8 @@ typedef struct ProcessClass_ {
 
 #define As_Process(this_)              ((ProcessClass*)((this_)->super.klass))
 
+#define Process_getParentPid(process_)    (process_->tgid == process_->pid ? process_->ppid : process_->tgid)
+
 #define Process_isChildOf(process_, pid_) (process_->tgid == pid_ || (process_->tgid == process_->pid && process_->ppid == pid_))
 
 #define Process_sortState(state) ((state) == 'I' ? 0x100 : (state))
@@ -183,10 +193,12 @@ static int Process_getuid = -1;
 #define ONE_K 1024L
 #define ONE_M (ONE_K * ONE_K)
 #define ONE_G (ONE_M * ONE_K)
+#define ONE_T ((long long)ONE_G * ONE_K)
 
 #define ONE_DECIMAL_K 1000L
 #define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
 #define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
+#define ONE_DECIMAL_T ((long long)ONE_DECIMAL_G * ONE_DECIMAL_K)
 
 char Process_pidFormat[20] = "%7d ";
 
@@ -220,7 +232,7 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
    if(number >= (10 * ONE_DECIMAL_M)) {
       #ifdef __LP64__
       if(number >= (100 * ONE_DECIMAL_G)) {
-         len = snprintf(buffer, 10, "%4ldT ", number / ONE_G);
+         len = snprintf(buffer, 10, "%4luT ", number / ONE_G);
          RichString_appendn(str, largeNumberColor, buffer, len);
          return;
       } else if (number >= (1000 * ONE_DECIMAL_M)) {
@@ -230,7 +242,7 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
       }
       #endif
       if(number >= (100 * ONE_DECIMAL_M)) {
-         len = snprintf(buffer, 10, "%4ldG ", number / ONE_M);
+         len = snprintf(buffer, 10, "%4luG ", number / ONE_M);
          RichString_appendn(str, largeNumberColor, buffer, len);
          return;
       }
@@ -238,11 +250,11 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
       RichString_appendn(str, largeNumberColor, buffer, len);
       return;
    } else if (number >= 100000) {
-      len = snprintf(buffer, 10, "%4ldM ", number / ONE_K);
+      len = snprintf(buffer, 10, "%4luM ", number / ONE_K);
       RichString_appendn(str, processMegabytesColor, buffer, len);
       return;
    } else if (number >= 1000) {
-      len = snprintf(buffer, 10, "%2ld", number/1000);
+      len = snprintf(buffer, 10, "%2lu", number/1000);
       RichString_appendn(str, processMegabytesColor, buffer, len);
       number %= 1000;
       len = snprintf(buffer, 10, "%03lu ", number);
@@ -269,8 +281,15 @@ void Process_colorNumber(RichString* str, unsigned long long number, bool colori
    if ((long long) number == -1LL) {
       int len = snprintf(buffer, 13, "    no perm ");
       RichString_appendn(str, CRT_colors[PROCESS_SHADOW], buffer, len);
-   } else if (number > 10000000000) {
+   } else if (number >= 100000LL * ONE_DECIMAL_T) {
-      xSnprintf(buffer, 13, "%11lld ", number / 1000);
+      xSnprintf(buffer, 13, "%11llu ", number / ONE_DECIMAL_G);
+      RichString_appendn(str, largeNumberColor, buffer, 12);
+   } else if (number >= 100LL * ONE_DECIMAL_T) {
+      xSnprintf(buffer, 13, "%11llu ", number / ONE_DECIMAL_M);
+      RichString_appendn(str, largeNumberColor, buffer, 8);
+      RichString_appendn(str, processMegabytesColor, buffer+8, 4);
+   } else if (number >= 10LL * ONE_DECIMAL_G) {
+      xSnprintf(buffer, 13, "%11llu ", number / ONE_DECIMAL_K);
       RichString_appendn(str, largeNumberColor, buffer, 5);
       RichString_appendn(str, processMegabytesColor, buffer+5, 3);
       RichString_appendn(str, processColor, buffer+8, 4);
@@ -350,14 +369,17 @@ void Process_outputRate(RichString* str, char* buffer, int n, double rate, int c
    } else if (rate < ONE_K) {
       int len = snprintf(buffer, n, "%7.2f B/s ", rate);
       RichString_appendn(str, processColor, buffer, len);
-   } else if (rate < ONE_K * ONE_K) {
+   } else if (rate < ONE_M) {
       int len = snprintf(buffer, n, "%7.2f K/s ", rate / ONE_K);
       RichString_appendn(str, processColor, buffer, len);
-   } else if (rate < ONE_K * ONE_K * ONE_K) {
+   } else if (rate < ONE_G) {
-      int len = snprintf(buffer, n, "%7.2f M/s ", rate / ONE_K / ONE_K);
+      int len = snprintf(buffer, n, "%7.2f M/s ", rate / ONE_M);
       RichString_appendn(str, processMegabytesColor, buffer, len);
+   } else if (rate < ONE_T) {
+      int len = snprintf(buffer, n, "%7.2f G/s ", rate / ONE_G);
+      RichString_appendn(str, largeNumberColor, buffer, len);
    } else {
-      int len = snprintf(buffer, n, "%7.2f G/s ", rate / ONE_K / ONE_K / ONE_K);
+      int len = snprintf(buffer, n, "%7.2f T/s ", rate / ONE_T);
       RichString_appendn(str, largeNumberColor, buffer, len);
    }
 }
@@ -372,9 +394,9 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
    switch (field) {
    case PERCENT_CPU: {
       if (this->percent_cpu > 999.9) {
-         xSnprintf(buffer, n, "%4d ", (unsigned int)this->percent_cpu); 
+         xSnprintf(buffer, n, "%4u ", (unsigned int)this->percent_cpu);
       } else if (this->percent_cpu > 99.9) {
-         xSnprintf(buffer, n, "%3d. ", (unsigned int)this->percent_cpu); 
+         xSnprintf(buffer, n, "%3u. ", (unsigned int)this->percent_cpu);
       } else {
          xSnprintf(buffer, n, "%4.1f ", this->percent_cpu);
       }
@@ -406,11 +428,16 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
             if (indent & (1U << i))
                maxIndent = i+1;
           for (int i = 0; i < maxIndent - 1; i++) {
-            int written;
+            int written, ret;
             if (indent & (1 << i))
-               written = snprintf(buf, n, "%s  ", CRT_treeStr[TREE_STR_VERT]);
+               ret = snprintf(buf, n, "%s  ", CRT_treeStr[TREE_STR_VERT]);
             else
-               written = snprintf(buf, n, "   ");
+               ret = snprintf(buf, n, "   ");
+            if (ret < 0 || ret >= n) {
+               written = n;
+            } else {
+               written = ret;
+            }
             buf += written;
             n -= written;
          }
@@ -458,7 +485,7 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
       }
       break;
    }
-   case ST_UID: xSnprintf(buffer, n, "%4d ", this->st_uid); break;
+   case ST_UID: xSnprintf(buffer, n, "%5d ", this->st_uid); break;
    case TIME: Process_printTime(str, this->time); return;
    case TGID: xSnprintf(buffer, n, Process_pidFormat, this->tgid); break;
    case TPGID: xSnprintf(buffer, n, Process_pidFormat, this->tpgid); break;
@@ -536,14 +563,15 @@ bool Process_setPriority(Process* this, int priority) {
    return (err == 0);
 }
 
-bool Process_changePriorityBy(Process* this, size_t delta) {
+bool Process_changePriorityBy(Process* this, Arg delta) {
-   return Process_setPriority(this, this->nice + delta);
+   return Process_setPriority(this, this->nice + delta.i);
 }
 
-void Process_sendSignal(Process* this, size_t sgn) {
+bool Process_sendSignal(Process* this, Arg sgn) {
    CRT_dropPrivileges();
-   kill(this->pid, (int) sgn);
+   bool ok = (kill(this->pid, sgn.i) == 0);
    CRT_restorePrivileges();
+   return ok;
 }
 
 long Process_pidCompare(const void* v1, const void* v2) {

Process.h

@@ -5,10 +5,15 @@
 /*
 htop - Process.h
 (C) 2004-2015 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
+#ifdef MAJOR_IN_MKDEV
+#elif defined(MAJOR_IN_SYSMACROS)
+#endif
+
 #ifdef __ANDROID__
 #define SYS_ioprio_get __NR_ioprio_get
 #define SYS_ioprio_set __NR_ioprio_set
@@ -151,6 +156,8 @@ typedef struct ProcessClass_ {
 
 #define As_Process(this_)              ((ProcessClass*)((this_)->super.klass))
 
+#define Process_getParentPid(process_)    (process_->tgid == process_->pid ? process_->ppid : process_->tgid)
+
 #define Process_isChildOf(process_, pid_) (process_->tgid == pid_ || (process_->tgid == process_->pid && process_->ppid == pid_))
 
 #define Process_sortState(state) ((state) == 'I' ? 0x100 : (state))
@@ -159,43 +166,45 @@ typedef struct ProcessClass_ {
 #define ONE_K 1024L
 #define ONE_M (ONE_K * ONE_K)
 #define ONE_G (ONE_M * ONE_K)
+#define ONE_T ((long long)ONE_G * ONE_K)
 
 #define ONE_DECIMAL_K 1000L
 #define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
 #define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
+#define ONE_DECIMAL_T ((long long)ONE_DECIMAL_G * ONE_DECIMAL_K)
 
 extern char Process_pidFormat[20];
 
-void Process_setupColumnWidths();
+extern void Process_setupColumnWidths();
 
-void Process_humanNumber(RichString* str, unsigned long number, bool coloring);
+extern void Process_humanNumber(RichString* str, unsigned long number, bool coloring);
 
-void Process_colorNumber(RichString* str, unsigned long long number, bool coloring);
+extern void Process_colorNumber(RichString* str, unsigned long long number, bool coloring);
 
-void Process_printTime(RichString* str, unsigned long long totalHundredths);
+extern void Process_printTime(RichString* str, unsigned long long totalHundredths);
 
-void Process_outputRate(RichString* str, char* buffer, int n, double rate, int coloring);
+extern void Process_outputRate(RichString* str, char* buffer, int n, double rate, int coloring);
 
-void Process_writeField(Process* this, RichString* str, ProcessField field);
+extern void Process_writeField(Process* this, RichString* str, ProcessField field);
 
-void Process_display(Object* cast, RichString* out);
+extern void Process_display(Object* cast, RichString* out);
 
-void Process_done(Process* this);
+extern void Process_done(Process* this);
 
 extern ProcessClass Process_class;
 
-void Process_init(Process* this, struct Settings_* settings);
+extern void Process_init(Process* this, struct Settings_* settings);
 
-void Process_toggleTag(Process* this);
+extern void Process_toggleTag(Process* this);
 
-bool Process_setPriority(Process* this, int priority);
+extern bool Process_setPriority(Process* this, int priority);
 
-bool Process_changePriorityBy(Process* this, size_t delta);
+extern bool Process_changePriorityBy(Process* this, Arg delta);
 
-void Process_sendSignal(Process* this, size_t sgn);
+extern bool Process_sendSignal(Process* this, Arg sgn);
 
-long Process_pidCompare(const void* v1, const void* v2);
+extern long Process_pidCompare(const void* v1, const void* v2);
 
-long Process_compare(const void* v1, const void* v2);
+extern long Process_compare(const void* v1, const void* v2);
 
 #endif

ProcessList.c

@@ -228,7 +228,7 @@ void ProcessList_sort(ProcessList* this) {
                ProcessList_buildTree(this, process->pid, 0, 0, direction, false);
                break;
             }
-            pid_t ppid = process->tgid == process->pid ? process->ppid : process->tgid;
+            pid_t ppid = Process_getParentPid(process);
             // Bisect the process vector to find parent
             int l = 0, r = size;
             // If PID corresponds with PPID (e.g. "kernel_task" (PID:0, PPID:0)

ProcessList.h

@@ -71,32 +71,32 @@ void ProcessList_delete(ProcessList* pl);
 void ProcessList_goThroughEntries(ProcessList* pl);
 
 
-ProcessList* ProcessList_init(ProcessList* this, ObjectClass* klass, UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
+extern ProcessList* ProcessList_init(ProcessList* this, ObjectClass* klass, UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
 
-void ProcessList_done(ProcessList* this);
+extern void ProcessList_done(ProcessList* this);
 
-void ProcessList_setPanel(ProcessList* this, Panel* panel);
+extern void ProcessList_setPanel(ProcessList* this, Panel* panel);
 
-void ProcessList_printHeader(ProcessList* this, RichString* header);
+extern void ProcessList_printHeader(ProcessList* this, RichString* header);
 
-void ProcessList_add(ProcessList* this, Process* p);
+extern void ProcessList_add(ProcessList* this, Process* p);
 
-void ProcessList_remove(ProcessList* this, Process* p);
+extern void ProcessList_remove(ProcessList* this, Process* p);
 
-Process* ProcessList_get(ProcessList* this, int idx);
+extern Process* ProcessList_get(ProcessList* this, int idx);
 
-int ProcessList_size(ProcessList* this);
+extern int ProcessList_size(ProcessList* this);
 
-void ProcessList_sort(ProcessList* this);
+extern void ProcessList_sort(ProcessList* this);
 
-ProcessField ProcessList_keyAt(ProcessList* this, int at);
+extern ProcessField ProcessList_keyAt(ProcessList* this, int at);
 
-void ProcessList_expandTree(ProcessList* this);
+extern void ProcessList_expandTree(ProcessList* this);
 
-void ProcessList_rebuildPanel(ProcessList* this);
+extern void ProcessList_rebuildPanel(ProcessList* this);
 
-Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_New constructor);
+extern Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_New constructor);
 
-void ProcessList_scan(ProcessList* this);
+extern void ProcessList_scan(ProcessList* this);
 
 #endif

README

@@ -1,46 +1,28 @@
-[![Build Status](https://travis-ci.org/hishamhm/htop.svg?branch=master)](https://travis-ci.org/hishamhm/htop)
+![htop](https://htop.dev)
-[![PayPal donate](https://img.shields.io/badge/paypal-donate-green.svg)](http://hisham.hm/htop/index.php?page=donate)
 
-[htop](http://hisham.hm/htop/)
+[![CI](https://github.com/htop-dev/htop/workflows/CI/badge.svg)](https://github.com/htop-dev/htop/actions)
-====
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/21617/badge.svg)](https://scan.coverity.com/projects/21617)
-
+[![Mailing List](https://img.shields.io/badge/Mailing%20List-htop-blue.svg)](https://groups.io/g/htop)
-by Hisham Muhammad <hisham@gobolinux.org> (2004 - 2016)
+[![IRC #htop](https://img.shields.io/badge/IRC-htop-blue.svg)](https://webchat.freenode.net/#htop)
+[![Github Release](https://img.shields.io/github/release/htop-dev/htop.svg)](https://github.com/htop-dev/htop/releases/latest)
 
 Introduction
 ------------
 
-This is `htop`, an interactive process viewer.
+`htop` is a cross-platform interactive process viewer.
-It requires `ncurses`. It is developed primarily on Linux,
+It requires `ncurses`.
-but we also have code for running under FreeBSD and Mac OS X
-(help and testing are wanted for these platforms!)
 
-This software has evolved considerably over the years,
+For more information and details on how to contribute to `htop`
-and is reasonably complete, but there is always room for improvement.
+visit [htop.dev](https://htop.dev).
 
-Comparison between `htop` and classic `top`
+Build instructions
--------------------------------------------
+------------------
-
-* In `htop` you can scroll the list vertically and horizontally
-  to see all processes and full command lines.
-* In `top` you are subject to a delay for each unassigned
-  key you press (especially annoying when multi-key escape
-  sequences are triggered by accident).
-* `htop` starts faster (`top` seems to collect data for a while
-  before displaying anything).
-* In `htop` you don't need to type the process number to
-  kill a process, in `top` you do.
-* In `htop` you don't need to type the process number or
-  the priority value to renice a process, in `top` you do.
-* In `htop` you can kill multiple processes at once.
-* `top` is older, hence, more tested.
-
-Compilation instructions
-------------------------
 
 This program is distributed as a standard autotools-based package.
-See the [INSTALL](/INSTALL) file for detailed instructions.
+For detailed instructions see the [INSTALL](/INSTALL) file, which
+is created after `./autogen.sh` is run.
 
-When compiling from a [release tarball](https://hisham.hm/htop/releases/), run:
+When compiling from a [release tarball](https://github.com/htop-dev/htop/releases/), run:
 
     ./configure && make
 
@@ -54,8 +36,6 @@ the path use `./configure --prefix=/some/path`.
 See the manual page (`man htop`) or the on-line help ('F1' or 'h'
 inside `htop`) for a list of supported key commands.
 
-If not all keys work check your curses configuration.
-
 ## License
 
 GNU General Public License, version 2 (GPL-2.0)

RichString.c

@@ -63,6 +63,10 @@ typedef struct RichString_ {
 
 }*/
 
+#ifndef CLAMP
+#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
+#endif
+
 #define charBytes(n) (sizeof(CharType) * (n))
 
 static void RichString_extendLen(RichString* this, int len) {
@@ -103,6 +107,7 @@ static inline void RichString_writeFrom(RichString* this, int attrs, const char*
 
 inline void RichString_setAttrn(RichString* this, int attrs, int start, int finish) {
    cchar_t* ch = this->chptr + start;
+   finish = CLAMP(finish, 0, this->chlen - 1);
    for (int i = start; i <= finish; i++) {
       ch->attr = attrs;
       ch++;
@@ -132,6 +137,7 @@ static inline void RichString_writeFrom(RichString* this, int attrs, const char*
 
 void RichString_setAttrn(RichString* this, int attrs, int start, int finish) {
    chtype* ch = this->chptr + start;
+   finish = CLAMP(finish, 0, this->chlen - 1);
    for (int i = start; i <= finish; i++) {
       *ch = (*ch & 0xff) | attrs;
       ch++;

RichString.h

@@ -59,6 +59,10 @@ typedef struct RichString_ {
 } RichString;
 
 
+#ifndef CLAMP
+#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
+#endif
+
 #define charBytes(n) (sizeof(CharType) * (n))
 
 #define RichString_setLen(this, len) do{ if(len < RICHSTRING_MAXLEN && this->chlen < RICHSTRING_MAXLEN) { RichString_setChar(this,len,0); this->chlen=len; } else RichString_extendLen(this,len); }while(0)
@@ -67,24 +71,24 @@ typedef struct RichString_ {
 
 extern void RichString_setAttrn(RichString* this, int attrs, int start, int finish);
 
-int RichString_findChar(RichString* this, char c, int start);
+extern int RichString_findChar(RichString* this, char c, int start);
 
 #else
 
-void RichString_setAttrn(RichString* this, int attrs, int start, int finish);
+extern void RichString_setAttrn(RichString* this, int attrs, int start, int finish);
 
-int RichString_findChar(RichString* this, char c, int start);
+extern int RichString_findChar(RichString* this, char c, int start);
 
 #endif
 
-void RichString_prune(RichString* this);
+extern void RichString_prune(RichString* this);
 
-void RichString_setAttr(RichString* this, int attrs);
+extern void RichString_setAttr(RichString* this, int attrs);
 
-void RichString_append(RichString* this, int attrs, const char* data);
+extern void RichString_append(RichString* this, int attrs, const char* data);
 
-void RichString_appendn(RichString* this, int attrs, const char* data, int len);
+extern void RichString_appendn(RichString* this, int attrs, const char* data, int len);
 
-void RichString_write(RichString* this, int attrs, const char* data);
+extern void RichString_write(RichString* this, int attrs, const char* data);
 
 #endif

ScreenManager.c

@@ -145,14 +145,12 @@ static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTi
 }
 
 static void ScreenManager_drawPanels(ScreenManager* this, int focus) {
-   int nPanels = this->panelCount;
+   const int nPanels = this->panelCount;
    for (int i = 0; i < nPanels; i++) {
       Panel* panel = (Panel*) Vector_get(this->panels, i);
       Panel_draw(panel, i == focus);
-      if (i < nPanels) {
+      if (this->orientation == HORIZONTAL) {
-         if (this->orientation == HORIZONTAL) {
+         mvvline(panel->y, panel->x+panel->w, ' ', panel->h+1);
-            mvvline(panel->y, panel->x+panel->w, ' ', panel->h+1);
-         }
       }
    }
 }
@@ -192,8 +190,24 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
       set_escdelay(25);
       ch = getch();
 
+      if (this->settings->vimMode) {
+         switch (ch) {
+            case 'h': ch = KEY_LEFT; break;
+            case 'j': ch = KEY_DOWN; break;
+            case 'k': ch = KEY_UP; break;
+            case 'l': ch = KEY_RIGHT; break;
+            case KEY_LEFT: ch = 'h'; break;
+            case KEY_DOWN: ch = 'j'; break;
+            case KEY_UP: ch = 'k'; break;
+            case KEY_RIGHT: ch = 'l'; break;
+            case 'K': ch = 'k'; break;
+            case 'J': ch = 'K'; break;
+            case 'L': ch = 'l'; break;
+         }
+      }
+
       HandlerResult result = IGNORED;
-      if (ch == KEY_MOUSE) {
+      if (ch == KEY_MOUSE && this->settings->enableMouse) {
          ch = ERR;
          MEVENT mevent;
          int ok = getmouse(&mevent);

ScreenManager.h

@@ -35,18 +35,18 @@ typedef struct ScreenManager_ {
 } ScreenManager;
 
 
-ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation orientation, const Header* header, const Settings* settings, bool owner);
+extern ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation orientation, const Header* header, const Settings* settings, bool owner);
 
-void ScreenManager_delete(ScreenManager* this);
+extern void ScreenManager_delete(ScreenManager* this);
 
 extern int ScreenManager_size(ScreenManager* this);
 
-void ScreenManager_add(ScreenManager* this, Panel* item, int size);
+extern void ScreenManager_add(ScreenManager* this, Panel* item, int size);
 
-Panel* ScreenManager_remove(ScreenManager* this, int idx);
+extern Panel* ScreenManager_remove(ScreenManager* this, int idx);
 
-void ScreenManager_resize(ScreenManager* this, int x1, int y1, int x2, int y2);
+extern void ScreenManager_resize(ScreenManager* this, int x1, int y1, int x2, int y2);
 
-void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey);
+extern void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey);
 
 #endif

Settings.c

@@ -45,6 +45,8 @@ typedef struct Settings_ {
 
    bool countCPUsFromZero;
    bool detailedCPUTime;
+   bool showCPUUsage;
+   bool showCPUFrequency;
    bool treeView;
    bool showProgramPath;
    bool hideThreads;
@@ -58,6 +60,8 @@ typedef struct Settings_ {
    bool updateProcessNames;
    bool accountGuestInCPUMeter;
    bool headerMargin;
+   bool enableMouse;
+   bool vimMode;
 
    bool changed;
 } Settings;
@@ -172,7 +176,8 @@ static bool Settings_read(Settings* this, const char* fileName) {
    if (!fd)
       return false;
 
-   bool readMeters = false;
+   bool didReadMeters = false;
+   bool didReadFields = false;
    for (;;) {
       char* line = String_readLine(fd);
       if (!line) {
@@ -187,6 +192,7 @@ static bool Settings_read(Settings* this, const char* fileName) {
       }
       if (String_eq(option[0], "fields")) {
          readFields(this->fields, &(this->flags), option[1]);
+         didReadFields = true;
       } else if (String_eq(option[0], "sort_key")) {
          // This "+1" is for compatibility with the older enum format.
          this->sortKey = atoi(option[1]) + 1;
@@ -221,6 +227,10 @@ static bool Settings_read(Settings* this, const char* fileName) {
          this->detailedCPUTime = atoi(option[1]);
       } else if (String_eq(option[0], "cpu_count_from_zero")) {
          this->countCPUsFromZero = atoi(option[1]);
+      } else if (String_eq(option[0], "show_cpu_usage")) {
+         this->showCPUUsage = atoi(option[1]);
+      } else if (String_eq(option[0], "show_cpu_frequency")) {
+         this->showCPUFrequency = atoi(option[1]);
       } else if (String_eq(option[0], "update_process_names")) {
          this->updateProcessNames = atoi(option[1]);
       } else if (String_eq(option[0], "account_guest_in_cpu_meter")) {
@@ -230,26 +240,30 @@ static bool Settings_read(Settings* this, const char* fileName) {
       } else if (String_eq(option[0], "color_scheme")) {
          this->colorScheme = atoi(option[1]);
          if (this->colorScheme < 0 || this->colorScheme >= LAST_COLORSCHEME) this->colorScheme = 0;
+     } else if (String_eq(option[0], "enable_mouse")) {
+         this->enableMouse = atoi(option[1]);
       } else if (String_eq(option[0], "left_meters")) {
          Settings_readMeters(this, option[1], 0);
-         readMeters = true;
+         didReadMeters = true;
       } else if (String_eq(option[0], "right_meters")) {
          Settings_readMeters(this, option[1], 1);
-         readMeters = true;
+         didReadMeters = true;
       } else if (String_eq(option[0], "left_meter_modes")) {
          Settings_readMeterModes(this, option[1], 0);
-         readMeters = true;
+         didReadMeters = true;
       } else if (String_eq(option[0], "right_meter_modes")) {
          Settings_readMeterModes(this, option[1], 1);
-         readMeters = true;
+         didReadMeters = true;
+      } else if (String_eq(option[0], "vim_mode")) {
+         this->vimMode = atoi(option[1]);
       }
       String_freeArray(option);
    }
    fclose(fd);
-   if (!readMeters) {
+   if (!didReadMeters) {
       Settings_defaultMeters(this);
    }
-   return true;
+   return didReadFields;
 }
 
 static void writeFields(FILE* fd, ProcessField* fields, const char* name) {
@@ -310,14 +324,18 @@ bool Settings_write(Settings* this) {
    fprintf(fd, "header_margin=%d\n", (int) this->headerMargin);
    fprintf(fd, "detailed_cpu_time=%d\n", (int) this->detailedCPUTime);
    fprintf(fd, "cpu_count_from_zero=%d\n", (int) this->countCPUsFromZero);
+   fprintf(fd, "show_cpu_usage=%d\n", (int) this->showCPUUsage);
+   fprintf(fd, "show_cpu_frequency=%d\n", (int) this->showCPUFrequency);
    fprintf(fd, "update_process_names=%d\n", (int) this->updateProcessNames);
    fprintf(fd, "account_guest_in_cpu_meter=%d\n", (int) this->accountGuestInCPUMeter);
    fprintf(fd, "color_scheme=%d\n", (int) this->colorScheme);
+   fprintf(fd, "enable_mouse=%d\n", (int) this->enableMouse);
    fprintf(fd, "delay=%d\n", (int) this->delay);
    fprintf(fd, "left_meters="); writeMeters(this, fd, 0);
    fprintf(fd, "left_meter_modes="); writeMeterModes(this, fd, 0);
    fprintf(fd, "right_meters="); writeMeters(this, fd, 1);
    fprintf(fd, "right_meter_modes="); writeMeterModes(this, fd, 1);
+   fprintf(fd, "vim_mode=%d\n", (int) this->vimMode);
    fclose(fd);
    return true;
 }
@@ -338,6 +356,8 @@ Settings* Settings_new(int cpuCount) {
    this->highlightMegabytes = false;
    this->detailedCPUTime = false;
    this->countCPUsFromZero = false;
+   this->showCPUUsage = true;
+   this->showCPUFrequency = false;
    this->updateProcessNames = false;
    this->cpuCount = cpuCount;
    this->showProgramPath = true;
@@ -380,40 +400,44 @@ Settings* Settings_new(int cpuCount) {
       free(htopDir);
       free(configDir);
       struct stat st;
-      if (lstat(legacyDotfile, &st) != 0) {
+      int err = lstat(legacyDotfile, &st);
-         st.st_mode = 0;
+      if (err || S_ISLNK(st.st_mode)) {
-      }
-      if (access(legacyDotfile, R_OK) != 0 || S_ISLNK(st.st_mode)) {
          free(legacyDotfile);
          legacyDotfile = NULL;
       }
       CRT_restorePrivileges();
    }
    this->colorScheme = 0;
+   this->enableMouse = true;
    this->changed = false;
    this->delay = DEFAULT_DELAY;
-   bool ok = Settings_read(this, legacyDotfile ? legacyDotfile : this->filename);
+   bool ok = false;
-   if (ok) {
+   if (legacyDotfile) {
-      if (legacyDotfile) {
+      ok = Settings_read(this, legacyDotfile);
+      if (ok) {
          // Transition to new location and delete old configuration file
          if (Settings_write(this))
             unlink(legacyDotfile);
       }
-   } else {
+      free(legacyDotfile);
+   }
+   if (!ok) {
+      ok = Settings_read(this, this->filename);
+   }
+   if (!ok) {
       this->changed = true;
       // TODO: how to get SYSCONFDIR correctly through Autoconf?
       char* systemSettings = String_cat(SYSCONFDIR, "/htoprc");
       ok = Settings_read(this, systemSettings);
       free(systemSettings);
-      if (!ok) {
-         Settings_defaultMeters(this);
-         this->hideKernelThreads = true;
-         this->highlightMegabytes = true;
-         this->highlightThreads = true;
-         this->headerMargin = true;
-      }
    }
-   free(legacyDotfile);
+   if (!ok) {
+      Settings_defaultMeters(this);
+      this->hideKernelThreads = true;
+      this->highlightMegabytes = true;
+      this->highlightThreads = true;
+      this->headerMargin = true;
+   }
    return this;
 }
 

Settings.h

@@ -36,6 +36,8 @@ typedef struct Settings_ {
 
    bool countCPUsFromZero;
    bool detailedCPUTime;
+   bool showCPUUsage;
+   bool showCPUFrequency;
    bool treeView;
    bool showProgramPath;
    bool hideThreads;
@@ -49,6 +51,8 @@ typedef struct Settings_ {
    bool updateProcessNames;
    bool accountGuestInCPUMeter;
    bool headerMargin;
+   bool enableMouse;
+   bool vimMode;
 
    bool changed;
 } Settings;
@@ -58,12 +62,12 @@ typedef struct Settings_ {
 #endif
 
 
-void Settings_delete(Settings* this);
+extern void Settings_delete(Settings* this);
 
-bool Settings_write(Settings* this);
+extern bool Settings_write(Settings* this);
 
-Settings* Settings_new(int cpuCount);
+extern Settings* Settings_new(int cpuCount);
 
-void Settings_invertSortOrder(Settings* this);
+extern void Settings_invertSortOrder(Settings* this);
 
 #endif

SignalsPanel.c

@@ -41,10 +41,10 @@ Panel* SignalsPanel_new() {
    }
    #if (defined(SIGRTMIN) && defined(SIGRTMAX))
    if (SIGRTMAX - SIGRTMIN <= 100) {
-      static char buf[15];
+      static char buf[16];
       for (int sig = SIGRTMIN; sig <= SIGRTMAX; i++, sig++) {
          int n = sig - SIGRTMIN;
-         xSnprintf(buf, 15, "%2d SIGRTMIN%-+3d", sig, n);
+         xSnprintf(buf, 16, "%2d SIGRTMIN%-+3d", sig, n);
          if (n == 0) {
             buf[11] = '\0';
          }

SignalsPanel.h

@@ -16,6 +16,6 @@ typedef struct SignalItem_ {
 } SignalItem;
 
 
-Panel* SignalsPanel_new();
+extern Panel* SignalsPanel_new();
 
 #endif

StringUtils.c

@@ -30,8 +30,9 @@ char* String_cat(const char* s1, const char* s2) {
    int l1 = strlen(s1);
    int l2 = strlen(s2);
    char* out = xMalloc(l1 + l2 + 1);
-   strncpy(out, s1, l1);
+   memcpy(out, s1, l1);
-   strncpy(out+l1, s2, l2+1);
+   memcpy(out+l1, s2, l2+1);
+   out[l1 + l2] = '\0';
    return out;
 }
 

StringUtils.h

@@ -19,18 +19,18 @@ in the source distribution for its full text.
  * at compile time (e.g. when they are immutable string literals). :)
  */
 
-char* String_cat(const char* s1, const char* s2);
+extern char* String_cat(const char* s1, const char* s2);
 
-char* String_trim(const char* in);
+extern char* String_trim(const char* in);
 
 extern int String_eq(const char* s1, const char* s2);
 
-char** String_split(const char* s, char sep, int* n);
+extern char** String_split(const char* s, char sep, int* n);
 
-void String_freeArray(char** s);
+extern void String_freeArray(char** s);
 
-char* String_getToken(const char* line, const unsigned short int numMatch);
+extern char* String_getToken(const char* line, const unsigned short int numMatch);
 
-char* String_readLine(FILE* fd);
+extern char* String_readLine(FILE* fd);
 
 #endif

TasksMeter.c

@@ -15,7 +15,7 @@ in the source distribution for its full text.
 }*/
 
 int TasksMeter_attributes[] = {
-   CPU_KERNEL, PROCESS_THREAD, PROCESS, TASKS_RUNNING
+   CPU_SYSTEM, PROCESS_THREAD, PROCESS, TASKS_RUNNING
 };
 
 static void TasksMeter_updateValues(Meter* this, char* buffer, int len) {

TraceScreen.c

@@ -101,14 +101,15 @@ bool TraceScreen_forkTracer(TraceScreen* this) {
       int ok = fcntl(this->fdpair[1], F_SETFL, O_NONBLOCK);
       if (ok != -1) {
          xSnprintf(buffer, sizeof(buffer), "%d", this->super.process->pid);
-         execlp("strace", "strace", "-p", buffer, NULL);
+         execlp("strace", "strace", "-T", "-tt", "-s", "512", "-p", buffer, NULL);
       }
       const char* message = "Could not execute 'strace'. Please make sure it is available in your $PATH.";
       ssize_t written = write(this->fdpair[1], message, strlen(message));
       (void) written;
       exit(1);
    }
-   fcntl(this->fdpair[0], F_SETFL, O_NONBLOCK);
+   int ok = fcntl(this->fdpair[0], F_SETFL, O_NONBLOCK);
+   if (ok == -1) return false;
    this->strace = fdopen(this->fdpair[0], "r");
    this->fd_strace = fileno(this->strace);
    return true;

TraceScreen.h

@@ -25,16 +25,16 @@ typedef struct TraceScreen_ {
 
 extern InfoScreenClass TraceScreen_class;
 
-TraceScreen* TraceScreen_new(Process* process);
+extern TraceScreen* TraceScreen_new(Process* process);
 
-void TraceScreen_delete(Object* cast);
+extern void TraceScreen_delete(Object* cast);
 
-void TraceScreen_draw(InfoScreen* this);
+extern void TraceScreen_draw(InfoScreen* this);
 
-bool TraceScreen_forkTracer(TraceScreen* this);
+extern bool TraceScreen_forkTracer(TraceScreen* this);
 
-void TraceScreen_updateTrace(InfoScreen* super);
+extern void TraceScreen_updateTrace(InfoScreen* super);
 
-bool TraceScreen_onKey(InfoScreen* super, int ch);
+extern bool TraceScreen_onKey(InfoScreen* super, int ch);
 
 #endif

UsersTable.h

@@ -15,11 +15,11 @@ typedef struct UsersTable_ {
    Hashtable* users;
 } UsersTable;
 
-UsersTable* UsersTable_new();
+extern UsersTable* UsersTable_new();
 
-void UsersTable_delete(UsersTable* this);
+extern void UsersTable_delete(UsersTable* this);
 
-char* UsersTable_getRef(UsersTable* this, unsigned int uid);
+extern char* UsersTable_getRef(UsersTable* this, unsigned int uid);
 
 extern void UsersTable_foreach(UsersTable* this, Hashtable_PairFunction f, void* userData);
 

Vector.h

@@ -27,38 +27,38 @@ typedef struct Vector_ {
 } Vector;
 
 
-Vector* Vector_new(ObjectClass* type, bool owner, int size);
+extern Vector* Vector_new(ObjectClass* type, bool owner, int size);
 
-void Vector_delete(Vector* this);
+extern void Vector_delete(Vector* this);
 
 #ifdef DEBUG
 
-int Vector_count(Vector* this);
+extern int Vector_count(Vector* this);
 
 #endif
 
-void Vector_prune(Vector* this);
+extern void Vector_prune(Vector* this);
 
 // If I were to use only one sorting algorithm for both cases, it would probably be this one:
 /*
 
 */
 
-void Vector_quickSort(Vector* this);
+extern void Vector_quickSort(Vector* this);
 
-void Vector_insertionSort(Vector* this);
+extern void Vector_insertionSort(Vector* this);
 
-void Vector_insert(Vector* this, int idx, void* data_);
+extern void Vector_insert(Vector* this, int idx, void* data_);
 
-Object* Vector_take(Vector* this, int idx);
+extern Object* Vector_take(Vector* this, int idx);
 
-Object* Vector_remove(Vector* this, int idx);
+extern Object* Vector_remove(Vector* this, int idx);
 
-void Vector_moveUp(Vector* this, int idx);
+extern void Vector_moveUp(Vector* this, int idx);
 
-void Vector_moveDown(Vector* this, int idx);
+extern void Vector_moveDown(Vector* this, int idx);
 
-void Vector_set(Vector* this, int idx, void* data_);
+extern void Vector_set(Vector* this, int idx, void* data_);
 
 #ifdef DEBUG
 
@@ -84,7 +84,7 @@ extern int Vector_size(Vector* this);
 
 */
 
-void Vector_add(Vector* this, void* data_);
+extern void Vector_add(Vector* this, void* data_);
 
 extern int Vector_indexOf(Vector* this, void* search_, Object_Compare compare);
 

XAlloc.h

@@ -11,11 +11,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
-void* xMalloc(size_t size);
+extern void* xMalloc(size_t size);
 
-void* xCalloc(size_t nmemb, size_t size);
+extern void* xCalloc(size_t nmemb, size_t size);
 
-void* xRealloc(void* ptr, size_t size);
+extern void* xRealloc(void* ptr, size_t size);
 
 #define xSnprintf(fmt, len, ...) do { int _l=len; int _n=snprintf(fmt, _l, __VA_ARGS__); if (!(_n > -1 && _n < _l)) { curs_set(1); endwin(); err(1, NULL); } } while(0)
 
@@ -32,9 +32,9 @@ void* xRealloc(void* ptr, size_t size);
 #endif
 #if (__has_attribute(nonnull) || \
     ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)))
-char* xStrdup_(const char* str) __attribute__((nonnull));
+extern char* xStrdup_(const char* str) __attribute__((nonnull));
 #endif // __has_attribute(nonnull) || GNU C 3.3 or later
 
-char* xStrdup_(const char* str);
+extern char* xStrdup_(const char* str);
 
 #endif

configure.ac

@@ -2,10 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.65)
-AC_INIT([htop],[2.1.0],[hisham@gobolinux.org])
+AC_INIT([htop],[3.0.0],[htop@groups.io])
-
-SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
-year=$(date -u -d "@$SOURCE_DATE_EPOCH" "+%Y" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+%Y" 2>/dev/null || date -u "+%Y")
 
 AC_CONFIG_SRCDIR([htop.c])
 AC_CONFIG_AUX_DIR([.])
@@ -43,6 +40,9 @@ dragonfly*)
 darwin*)
    my_htop_platform=darwin
    ;;
+solaris*)
+   my_htop_platform=solaris
+   ;;
 *)
    my_htop_platform=unsupported
    ;;
@@ -61,6 +61,16 @@ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[
 ])
 AC_CHECK_HEADERS([execinfo.h],[:],[:])
 
+AC_HEADER_MAJOR
+dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to
+dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet
+dnl been updated in Autoconf 2.69, so use a workaround:
+m4_version_prereq([2.70], [],
+[if test "x$ac_cv_header_sys_mkdev_h" != xyes; then
+   AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1,
+      [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])])
+fi])
+
 # Checks for typedefs, structures, and compiler characteristics.
 # ----------------------------------------------------------------------
 AC_HEADER_STDBOOL
@@ -154,19 +164,25 @@ m4_define([HTOP_CHECK_SCRIPT],
 [
    if test ! -z "m4_toupper($HTOP_[$1]_CONFIG_SCRIPT)"; then
       # to be used to set the path to ncurses*-config when cross-compiling
-      htop_config_script=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
+      htop_config_script_libs=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
+      htop_config_script_cflags=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --cflags 2> /dev/null)
    else
-      htop_config_script=$([$4] --libs 2> /dev/null)
+      htop_config_script_libs=$([$4] --libs 2> /dev/null)
+      htop_config_script_cflags=$([$4] --cflags 2> /dev/null)
    fi
    htop_script_success=no
    htop_save_LDFLAGS="$LDFLAGS"
-   if test ! "x$htop_config_script" = x; then
+   htop_save_CFLAGS="$CFLAGS"
-      LDFLAGS="$htop_config_script $LDFLAGS"
+   if test ! "x$htop_config_script_libs" = x; then
+      LDFLAGS="$htop_config_script_libs $LDFLAGS"
+      CFLAGS="$htop_config_script_cflags $CFLAGS"
       AC_CHECK_LIB([$1], [$2], [
          AC_DEFINE([$3], 1, [The library is present.])
-         LIBS="$htop_config_script $LIBS "
+         LIBS="$htop_config_script_libs $LIBS "
          htop_script_success=yes
-      ], [])
+      ], [
+        CFLAGS="$htop_save_CFLAGS"
+      ])
       LDFLAGS="$htop_save_LDFLAGS"
    fi
    if test "x$htop_script_success" = xno; then
@@ -222,6 +238,12 @@ if test "$my_htop_platform" = "openbsd"; then
    AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
 fi
 
+if test "$my_htop_platform" = "solaris"; then
+   AC_CHECK_LIB([kstat], [kstat_open], [], [missing_libraries="$missing_libraries libkstat"])
+   AC_CHECK_LIB([proc], [Pgrab_error], [], [missing_libraries="$missing_libraries libproc"])
+   AC_CHECK_LIB([malloc], [free], [], [missing_libraries="$missing_libraries libmalloc"])
+fi
+
 AC_ARG_ENABLE(linux_affinity, [AS_HELP_STRING([--enable-linux-affinity], [enable Linux sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_linux_affinity="yes")
 if test "x$enable_linux_affinity" = xyes -a "x$cross_compiling" = xno; then
    AC_MSG_CHECKING([for usable sched_setaffinity])
@@ -256,15 +278,21 @@ then
    AC_DEFINE(HAVE_SETUID_ENABLED, 1, [Define if setuid support should be enabled.])
 fi
 
-AC_ARG_ENABLE(delayacct, [AS_HELP_STRING([--enable-delayacct], [enable linux delay accounting])],, enable_delayacct="no")
+AC_ARG_ENABLE(delayacct, [AS_HELP_STRING([--enable-delayacct], [enable Linux delay accounting])],, enable_delayacct="no")
 if test "x$enable_delayacct" = xyes
 then
-   PKG_PROG_PKG_CONFIG()
+   m4_ifdef([PKG_PROG_PKG_CONFIG], [
-   PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [missing_libraries="$missing_libraries libnl-3"])
+      PKG_PROG_PKG_CONFIG()
-   PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [missing_libraries="$missing_libraries libnl-genl-3"])
+      PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [missing_libraries="$missing_libraries libnl-3"])
-   CFLAGS+=" $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS"
+      PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [missing_libraries="$missing_libraries libnl-genl-3"])
-   LIBS+=" $LIBNL3_LIBS $LIBNL3GENL_LIBS"
+      CFLAGS="$CFLAGS $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS"
-   AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.])
+      LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS"
+      AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.])
+   ], [
+      pkg_m4_absent=1
+      m4_warning([configure is generated without pkg.m4. 'make dist' target will be disabled.])
+      AC_MSG_ERROR([htop on Linux requires pkg-config for checking delayacct requirements. Please install pkg-config and run ./autogen.sh to rebuild the configure script.])
+   ])
 fi
 
 
@@ -277,7 +305,7 @@ if test ! -z "$missing_headers"; then
   AC_MSG_ERROR([missing headers: $missing_headers])
 fi
 
-AC_DEFINE_UNQUOTED(COPYRIGHT, "(C) 2004-$year Hisham Muhammad", [Copyright message.])
+AC_DEFINE_UNQUOTED(COPYRIGHT, "(C) 2004-2018 Hisham Muhammad", [Copyright message.])
 
 # We're done, let's go!
 # ----------------------------------------------------------------------
@@ -286,6 +314,7 @@ AM_CONDITIONAL([HTOP_FREEBSD], [test "$my_htop_platform" = freebsd])
 AM_CONDITIONAL([HTOP_DRAGONFLYBSD], [test "$my_htop_platform" = dragonflybsd])
 AM_CONDITIONAL([HTOP_OPENBSD], [test "$my_htop_platform" = openbsd])
 AM_CONDITIONAL([HTOP_DARWIN], [test "$my_htop_platform" = darwin])
+AM_CONDITIONAL([HTOP_SOLARIS], [test "$my_htop_platform" = solaris])
 AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported])
 AC_SUBST(my_htop_platform)
 AC_CONFIG_FILES([Makefile htop.1])

darwin/DarwinProcessList.c

@@ -9,6 +9,8 @@ in the source distribution for its full text.
 #include "DarwinProcess.h"
 #include "DarwinProcessList.h"
 #include "CRT.h"
+#include "zfs/ZfsArcStats.h"
+#include "zfs/openzfs_sysctl.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -18,9 +20,43 @@ in the source distribution for its full text.
 #include <sys/mman.h>
 #include <utmpx.h>
 #include <err.h>
+#include <sys/sysctl.h>
+#include <stdbool.h>
+
+struct kern {
+    short int version[3];
+};
+
+void GetKernelVersion(struct kern *k) {
+   static short int version_[3] = {0};
+   if (!version_[0]) {
+      // just in case it fails someday
+      version_[0] = version_[1] = version_[2] = -1;
+      char str[256] = {0};
+      size_t size = sizeof(str);
+      int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0);
+      if (ret == 0) sscanf(str, "%hd.%hd.%hd", &version_[0], &version_[1], &version_[2]);
+    }
+    memcpy(k->version, version_, sizeof(version_));
+}
+
+/* compare the given os version with the one installed returns:
+0 if equals the installed version
+positive value if less than the installed version
+negative value if more than the installed version
+*/
+int CompareKernelVersion(short int major, short int minor, short int component) {
+    struct kern k;
+    GetKernelVersion(&k);
+    if ( k.version[0] !=  major) return k.version[0] - major;
+    if ( k.version[1] !=  minor) return k.version[1] - minor;
+    if ( k.version[2] !=  component) return k.version[2] - component;
+    return 0;
+}
 
 /*{
 #include "ProcessList.h"
+#include "zfs/ZfsArcStats.h"
 #include <mach/mach_host.h>
 #include <sys/sysctl.h>
 
@@ -34,6 +70,8 @@ typedef struct DarwinProcessList_ {
    uint64_t kernel_threads;
    uint64_t user_threads;
    uint64_t global_diff;
+
+   ZfsArcStats zfs;
 } DarwinProcessList;
 
 }*/
@@ -51,9 +89,8 @@ void ProcessList_freeCPULoadInfo(processor_cpu_load_info_t *p) {
        if(0 != munmap(*p, vm_page_size)) {
            CRT_fatalError("Unable to free old CPU load information\n");
        }
+       *p = NULL;
    }
-
-   *p = NULL;
 }
 
 unsigned ProcessList_allocateCPULoadInfo(processor_cpu_load_info_t *p) {
@@ -99,8 +136,8 @@ struct kinfo_proc *ProcessList_getKInfoProcs(size_t *count) {
    return processes;
 }
 
-
 ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
+   size_t len;
    DarwinProcessList* this = xCalloc(1, sizeof(DarwinProcessList));
 
    ProcessList_init(&this->super, Class(Process), usersTable, pidWhiteList, userId);
@@ -113,6 +150,10 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
    /* Initialize the VM statistics */
    ProcessList_getVMStats(&this->vm_stats);
 
+   /* Initialize the ZFS kstats, if zfs.kext loaded */
+   openzfs_sysctl_init(&this->zfs);
+   openzfs_sysctl_updateArcStats(&this->zfs);
+
    this->super.kernelThreads = 0;
    this->super.userlandThreads = 0;
    this->super.totalTasks = 0;
@@ -141,6 +182,7 @@ void ProcessList_goThroughEntries(ProcessList* super) {
     dpl->prev_load = dpl->curr_load;
     ProcessList_allocateCPULoadInfo(&dpl->curr_load);
     ProcessList_getVMStats(&dpl->vm_stats);
+    openzfs_sysctl_updateArcStats(&dpl->zfs);
 
     /* Get the time difference */
     dpl->global_diff = 0;
@@ -171,8 +213,12 @@ void ProcessList_goThroughEntries(ProcessList* super) {
        DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], tv.tv_sec, preExisting);
        DarwinProcess_setFromLibprocPidinfo(proc, dpl);
 
-       // Disabled due to bug in macOS High Sierra
+       // Disabled for High Sierra due to bug in macOS High Sierra
-       // DarwinProcess_scanThreads(proc);
+       bool isScanThreadSupported  = ! ( CompareKernelVersion(17, 0, 0) >= 0 && CompareKernelVersion(17, 5, 0) < 0);
+
+       if (isScanThreadSupported){
+           DarwinProcess_scanThreads(proc);
+       }
 
        super->totalTasks += 1;
 

darwin/DarwinProcessList.h

@@ -9,7 +9,19 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
+struct kern;
+
+void GetKernelVersion(struct kern *k);
+
+/* compare the given os version with the one installed returns:
+0 if equals the installed version
+positive value if less than the installed version
+negative value if more than the installed version
+*/
+int CompareKernelVersion(short int major, short int minor, short int component);
+
 #include "ProcessList.h"
+#include "zfs/ZfsArcStats.h"
 #include <mach/mach_host.h>
 #include <sys/sysctl.h>
 
@@ -23,6 +35,8 @@ typedef struct DarwinProcessList_ {
    uint64_t kernel_threads;
    uint64_t user_threads;
    uint64_t global_diff;
+
+   ZfsArcStats zfs;
 } DarwinProcessList;
 
 

darwin/Platform.c

@@ -15,6 +15,8 @@ in the source distribution for its full text.
 #include "ClockMeter.h"
 #include "HostnameMeter.h"
 #include "UptimeMeter.h"
+#include "zfs/ZfsArcMeter.h"
+#include "zfs/ZfsCompressedArcMeter.h"
 #include "DarwinProcessList.h"
 
 #include <stdlib.h>
@@ -90,7 +92,7 @@ ProcessFieldData Process_fields[] = {
    [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
    [M_SIZE] = { .name = "M_SIZE", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, },
    [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, },
-   [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+   [ST_UID] = { .name = "ST_UID", .title = "  UID ", .description = "User ID of the process owner", .flags = 0, },
    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
    [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
@@ -117,6 +119,8 @@ MeterClass* Platform_meterTypes[] = {
    &RightCPUsMeter_class,
    &LeftCPUs2Meter_class,
    &RightCPUs2Meter_class,
+   &ZfsArcMeter_class,
+   &ZfsCompressedArcMeter_class,
    &BlankMeter_class,
    NULL
 };
@@ -217,6 +221,8 @@ double Platform_setCPUValues(Meter* mtr, int cpu) {
    /* Convert to percent and return */
    total = mtr->values[CPU_METER_NICE] + mtr->values[CPU_METER_NORMAL] + mtr->values[CPU_METER_KERNEL];
 
+   mtr->values[CPU_METER_FREQUENCY] = -1;
+
    return CLAMP(total, 0.0, 100.0);
 }
 
@@ -241,6 +247,18 @@ void Platform_setSwapValues(Meter* mtr) {
   mtr->values[0] = swapused.xsu_used / 1024;
 }
 
+void Platform_setZfsArcValues(Meter* this) {
+   DarwinProcessList* dpl = (DarwinProcessList*) this->pl;
+
+   ZfsArcMeter_readStats(this, &(dpl->zfs));
+}
+
+void Platform_setZfsCompressedArcValues(Meter* this) {
+   DarwinProcessList* dpl = (DarwinProcessList*) this->pl;
+
+   ZfsCompressedArcMeter_readStats(this, &(dpl->zfs));
+}
+
 char* Platform_getProcessEnv(pid_t pid) {
    char* env = NULL;
 

darwin/Platform.h

@@ -48,6 +48,10 @@ void Platform_setMemoryValues(Meter* mtr);
 
 void Platform_setSwapValues(Meter* mtr);
 
+void Platform_setZfsArcValues(Meter* this);
+
+void Platform_setZfsCompressedArcValues(Meter* this);
+
 char* Platform_getProcessEnv(pid_t pid);
 
 #endif

dragonflybsd/DragonFlyBSDProcess.c

@@ -74,7 +74,7 @@ ProcessFieldData Process_fields[] = {
    [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
    [M_SIZE] = { .name = "M_SIZE", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, },
    [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, },
-   [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+   [ST_UID] = { .name = "ST_UID", .title = "  UID ", .description = "User ID of the process owner", .flags = 0, },
    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
    [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
@@ -121,7 +121,7 @@ void DragonFlyBSDProcess_writeField(Process* this, RichString* str, ProcessField
    case PID: xSnprintf(buffer, n, Process_pidFormat, (fp->kernel ? -1 : this->pid)); break;
    case JID: xSnprintf(buffer, n, Process_pidFormat, fp->jid); break;
    case JAIL:{
-      xSnprintf(buffer, n, "%-11s ", fp->jname); break;
+      xSnprintf(buffer, n, "%-11s ", fp->jname);
       if (buffer[11] != '\0') {
          buffer[11] = ' ';
          buffer[12] = '\0';

dragonflybsd/Platform.c

@@ -179,6 +179,9 @@ double Platform_setCPUValues(Meter* this, int cpu) {
 
    percent = CLAMP(percent, 0.0, 100.0);
    if (isnan(percent)) percent = 0.0;
+
+   v[CPU_METER_FREQUENCY] = -1;
+
    return percent;
 }
 

freebsd/FreeBSDProcess.c

@@ -73,7 +73,7 @@ ProcessFieldData Process_fields[] = {
    [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
    [M_SIZE] = { .name = "M_SIZE", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, },
    [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, },
-   [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+   [ST_UID] = { .name = "ST_UID", .title = "  UID ", .description = "User ID of the process owner", .flags = 0, },
    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
    [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
@@ -119,7 +119,7 @@ void FreeBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel
    // add FreeBSD-specific fields here
    case JID: xSnprintf(buffer, n, Process_pidFormat, fp->jid); break;
    case JAIL:{
-      xSnprintf(buffer, n, "%-11s ", fp->jname); break;
+      xSnprintf(buffer, n, "%-11s ", fp->jname);
       if (buffer[11] != '\0') {
          buffer[11] = ' ';
          buffer[12] = '\0';

freebsd/FreeBSDProcessList.c

@@ -8,6 +8,8 @@ in the source distribution for its full text.
 #include "ProcessList.h"
 #include "FreeBSDProcessList.h"
 #include "FreeBSDProcess.h"
+#include "zfs/ZfsArcStats.h"
+#include "zfs/openzfs_sysctl.h"
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -18,9 +20,12 @@ in the source distribution for its full text.
 #include <fcntl.h>
 #include <limits.h>
 #include <string.h>
+#include <time.h>
 
 /*{
 
+#include "zfs/ZfsArcStats.h"
+
 #include <kvm.h>
 #include <sys/param.h>
 #include <sys/jail.h>
@@ -45,14 +50,12 @@ typedef struct FreeBSDProcessList_ {
    ProcessList super;
    kvm_t* kd;
 
-   int zfsArcEnabled;
-
    unsigned long long int memWire;
    unsigned long long int memActive;
    unsigned long long int memInactive;
    unsigned long long int memFree;
-   unsigned long long int memZfsArc;
 
+   ZfsArcStats zfs;
 
    CPUData* cpus;
 
@@ -80,8 +83,6 @@ static int MIB_vm_stats_vm_v_free_count[4];
 
 static int MIB_vfs_bufspace[2];
 
-static int MIB_kstat_zfs_misc_arcstats_size[5];
-
 static int MIB_kern_cp_time[2];
 static int MIB_kern_cp_times[2];
 static int kernelFScale;
@@ -118,15 +119,8 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
 
    len = 2; sysctlnametomib("vfs.bufspace", MIB_vfs_bufspace, &len);
 
-   len = sizeof(fpl->memZfsArc);
+   openzfs_sysctl_init(&fpl->zfs);
-   if (sysctlbyname("kstat.zfs.misc.arcstats.size", &fpl->memZfsArc, &len,
+   openzfs_sysctl_updateArcStats(&fpl->zfs);
-	    NULL, 0) == 0 && fpl->memZfsArc != 0) {
-      sysctlnametomib("kstat.zfs.misc.arcstats.size", MIB_kstat_zfs_misc_arcstats_size, &len);
-		  fpl->zfsArcEnabled = 1;
-   } else {
-		  fpl->zfsArcEnabled = 0;
-   }
-
 
    int smp = 0;
    len = sizeof(smp);
@@ -296,35 +290,55 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) {
    //
    // htop_used   = active + (wired - arc)
    // htop_cache  = buffers + cache + arc
-   size_t len = sizeof(pl->totalMem);
+   u_long totalMem;
+   u_int memActive, memWire, cachedMem;
+   long buffersMem;
+   uint64_t memZfsArc;
+   size_t len;
 
    //disabled for now, as it is always smaller than phycal amount of memory...
    //...to avoid "where is my memory?" questions
    //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0);
    //pl->totalMem *= pageSizeKb;
-   sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0);
+   len = sizeof(totalMem);
-   pl->totalMem /= 1024;
+   sysctl(MIB_hw_physmem, 2, &(totalMem), &len, NULL, 0);
+   totalMem /= 1024;
+   pl->totalMem = totalMem;
 
-   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(fpl->memActive), &len, NULL, 0);
+   len = sizeof(memActive);
-   fpl->memActive *= pageSizeKb;
+   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0);
+   memActive *= pageSizeKb;
+   fpl->memActive = memActive;
 
-   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(fpl->memWire), &len, NULL, 0);
+   len = sizeof(memWire);
-   fpl->memWire *= pageSizeKb;
+   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0);
+   memWire *= pageSizeKb;
+   fpl->memWire = memWire;
 
-   sysctl(MIB_vfs_bufspace, 2, &(pl->buffersMem), &len, NULL, 0);
+   len = sizeof(buffersMem);
-   pl->buffersMem /= 1024;
+   sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0);
+   buffersMem /= 1024;
+   pl->buffersMem = buffersMem;
 
-   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0);
+   len = sizeof(cachedMem);
-   pl->cachedMem *= pageSizeKb;
+   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0);
+   cachedMem *= pageSizeKb;
+   pl->cachedMem = cachedMem;
 
    if (fpl->zfsArcEnabled) {
-      len = sizeof(fpl->memZfsArc);
+      len = sizeof(memZfsArc);
-      sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(fpl->memZfsArc), &len , NULL, 0);
+      sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(memZfsArc), &len , NULL, 0);
-      fpl->memZfsArc /= 1024;
+      memZfsArc /= 1024;
+      fpl->memZfsArc = memZfsArc;
       fpl->memWire -= fpl->memZfsArc;
       pl->cachedMem += fpl->memZfsArc;
       // maybe when we learn how to make custom memory meter
       // we could do custom arc breakdown?
+    }
+
+   if (fpl->zfs.enabled) {
+      fpl->memWire -= fpl->zfs.size;
+      pl->cachedMem += fpl->zfs.size;
    }
 
    pl->usedMem = fpl->memActive + fpl->memWire;
@@ -422,6 +436,7 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    bool hideKernelThreads = settings->hideKernelThreads;
    bool hideUserlandThreads = settings->hideUserlandThreads;
 
+   openzfs_sysctl_updateArcStats(&fpl->zfs);
    FreeBSDProcessList_scanMemoryInfo(this);
    FreeBSDProcessList_scanCPUTime(this);
 
@@ -429,10 +444,14 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    int count = 0;
    struct kinfo_proc* kprocs = kvm_getprocs(fpl->kd, KERN_PROC_PROC, 0, &count);
 
+   struct timeval tv;
+   gettimeofday(&tv, NULL);
+
    for (int i = 0; i < count; i++) {
       struct kinfo_proc* kproc = &kprocs[i];
       bool preExisting = false;
       bool isIdleProcess = false;
+      struct tm date;
       Process* proc = ProcessList_getProcess(this, kproc->ki_pid, &preExisting, (Process_New) FreeBSDProcess_new);
       FreeBSDProcess* fp = (FreeBSDProcess*) proc;
 
@@ -523,6 +542,9 @@ void ProcessList_goThroughEntries(ProcessList* this) {
          this->kernelThreads++;
       }
 
+      (void) localtime_r((time_t*) &proc->starttime_ctime, &date);
+      strftime(proc->starttime_show, 7, ((proc->starttime_ctime > tv.tv_sec - 86400) ? "%R " : "%b%d "), &date);
+
       this->totalTasks++;
       if (proc->state == 'R')
          this->runningTasks++;

freebsd/FreeBSDProcessList.h

@@ -10,6 +10,8 @@ in the source distribution for its full text.
 */
 
 
+#include "zfs/ZfsArcStats.h"
+
 #include <kvm.h>
 #include <sys/param.h>
 #include <sys/jail.h>
@@ -34,14 +36,12 @@ typedef struct FreeBSDProcessList_ {
    ProcessList super;
    kvm_t* kd;
 
-   int zfsArcEnabled;
-
    unsigned long long int memWire;
    unsigned long long int memActive;
    unsigned long long int memInactive;
    unsigned long long int memFree;
-   unsigned long long int memZfsArc;
 
+   ZfsArcStats zfs;
 
    CPUData* cpus;
 

freebsd/Platform.c

@@ -15,6 +15,8 @@ in the source distribution for its full text.
 #include "UptimeMeter.h"
 #include "ClockMeter.h"
 #include "HostnameMeter.h"
+#include "zfs/ZfsArcMeter.h"
+#include "zfs/ZfsCompressedArcMeter.h"
 #include "FreeBSDProcess.h"
 #include "FreeBSDProcessList.h"
 
@@ -104,6 +106,8 @@ MeterClass* Platform_meterTypes[] = {
    &LeftCPUs2Meter_class,
    &RightCPUs2Meter_class,
    &BlankMeter_class,
+   &ZfsArcMeter_class,
+   &ZfsCompressedArcMeter_class,
    NULL
 };
 
@@ -178,6 +182,9 @@ double Platform_setCPUValues(Meter* this, int cpu) {
 
    percent = CLAMP(percent, 0.0, 100.0);
    if (isnan(percent)) percent = 0.0;
+
+   v[CPU_METER_FREQUENCY] = -1;
+
    return percent;
 }
 
@@ -197,6 +204,18 @@ void Platform_setSwapValues(Meter* this) {
    this->values[0] = pl->usedSwap;
 }
 
+void Platform_setZfsArcValues(Meter* this) {
+   FreeBSDProcessList* fpl = (FreeBSDProcessList*) this->pl;
+
+   ZfsArcMeter_readStats(this, &(fpl->zfs));
+}
+
+void Platform_setZfsCompressedArcValues(Meter* this) {
+   FreeBSDProcessList* fpl = (FreeBSDProcessList*) this->pl;
+
+   ZfsCompressedArcMeter_readStats(this, &(fpl->zfs));
+}
+
 void Platform_setTasksValues(Meter* this) {
    // TODO
 }

freebsd/Platform.h

@@ -44,6 +44,10 @@ void Platform_setMemoryValues(Meter* this);
 
 void Platform_setSwapValues(Meter* this);
 
+void Platform_setZfsArcValues(Meter* this);
+
+void Platform_setZfsCompressedArcValues(Meter* this);
+
 void Platform_setTasksValues(Meter* this);
 
 char* Platform_getProcessEnv(pid_t pid);

htop.1.in

@@ -1,17 +1,22 @@
-.TH "HTOP" "1" "2015" "@PACKAGE_STRING@" "Utils"
+.TH "HTOP" "1" "2020" "@PACKAGE_STRING@" "User Commands"
 .SH "NAME"
 htop \- interactive process viewer
 .SH "SYNOPSIS"
 .LP 
-.B htop [\fI\-dChusv\fR]
+.B htop
+.RB [ \-dChpustv ]
 .SH "DESCRIPTION"
 .LP 
-Htop is a free (GPL) ncurses-based process viewer for Linux.
+.B htop
+is a cross-platform ncurses-based process viewer.
 .LP
-It is similar to top, but allows you to scroll vertically and horizontally,
+It is similar to
-so you can see all the processes running on the system, along with their full
+.BR top ,
-command lines, as well as viewing them as a process tree, selecting multiple
+but allows you to scroll vertically and horizontally, and interact using
-processes and acting on them all at once.
+a pointing device (mouse).
+You can observe all processes running on the system, along with their
+command line arguments, as well as view them in a tree format, select
+multiple processes and acting on them all at once.
 .LP
 Tasks related to processes (killing, renicing) can be done without
 entering their PIDs.
@@ -22,10 +27,14 @@ Mandatory arguments to long options are mandatory for short options too.
 .LP 
 .TP
 \fB\-d \-\-delay=DELAY\fR
-Delay between updates, in tenths of seconds
+Delay between updates, in tenths of seconds. If the delay value is
+less than 1 it is increased to 1, i.e. 1/10 second. If the delay value
+is greater than 100, it is decreased to 100, i.e. 10 seconds.
 .TP
 \fB\-C \-\-no-color \-\-no-colour\fR
-Start htop in monochrome mode
+Start
+.B htop
+in monochrome mode
 .TP
 \fB\-h \-\-help
 Display a help message and exit
@@ -41,11 +50,13 @@ Show only the processes of a given user
 .TP
 \fB\-v \-\-version
 Output version information and exit
-.PP
+.TP
-.br 
+\fB\-t \-\-tree
+Show processes in tree view
 .SH "INTERACTIVE COMMANDS"
 .LP 
-The following commands are supported while in htop:
+The following commands are supported while in
+.BR htop :
 .LP 
 .TP 5
 .B Up, Alt-k
@@ -82,8 +93,13 @@ Tag or untag a process. Commands that can operate on multiple processes,
 like "kill", will then apply over the list of tagged processes, instead
 of the currently highlighted one.
 .TP
+.B c
+Tag the current process and its children. Commands that can operate on multiple
+processes, like "kill", will then apply over the list of tagged processes,
+instead of the currently highlighted one.
+.TP
 .B U
-Untag all processes (remove all tags added with the Space key).
+Untag all processes (remove all tags added with the Space or c keys).
 .TP
 .B s
 Trace process system calls: if strace(1) is installed, pressing this key
@@ -186,14 +202,17 @@ Refresh: redraw screen and recalculate values.
 .B Numbers
 PID search: type in process ID and the selection highlight will be moved to it.
 .PD
-
 .SH "COLUMNS"
 .LP 
 The following columns can display data about each process. A value of '\-' in
 all the rows indicates that a column is unsupported on your system, or
-currently unimplemented in htop. The names below are the ones used in the
+currently unimplemented in
+.BR htop .
+The names below are the ones used in the
 "Available Columns" section of the setup screen. If a different name is
-shown in htop's main screen, it is shown below in parenthesis.
+shown in
+.BR htop 's
+main screen, it is shown below in parenthesis.
 .LP 
 .TP 5
 .B Command
@@ -381,36 +400,44 @@ The percentage of time spent swapping in pages. Requires CAP_NET_ADMIN.
 .TP
 .B All other flags
 Currently unsupported (always displays '-').
-
 .SH "CONFIG FILE"
 .LP 
-By default htop reads its configuration from the XDG-compliant path
+By default
-~/.config/htop/htoprc -- the configuration file is overwritten by htop's
+.B htop
-in-program Setup configuration, so it should not be hand-edited. If no
+reads its configuration from the XDG-compliant path
-user configuration exists htop tries to read the system-wide configuration
+.IR ~/.config/htop/htoprc .
-from @sysconfdir@/htoprc and as a last resort, falls back to its
+The configuration file is overwritten by
-hard coded defaults.
+.BR htop 's
+in-program Setup configuration, so it should not be hand-edited.
+If no user configuration exists
+.B htop
+tries to read the system-wide configuration from
+.I @sysconfdir@/htoprc
+and as a last resort, falls back to its hard coded defaults.
 .LP
 You may override the location of the configuration file using the $HTOPRC
 environment variable (so you can have multiple configurations for different
 machines that share the same home directory, for example).
-
 .SH "MEMORY SIZES"
 .LP
-Memory sizes in htop are displayed as they are in tools from the GNU Coreutils
+Memory sizes in
-(when ran with the --human-readable option). This means that sizes are printed
+.B htop
-in powers of 1024. (e.g., 1023M = 1072693248 Bytes)
+are displayed in a human-readable form.
+Sizes are printed in powers of 1024. (e.g., 1023M = 1072693248 Bytes)
 .LP
-The decision to use this convention was made in order to conserve screen space
+The decision to use this convention was made in order to conserve screen
-and make memory size representations consistent throughout htop.
+space and make memory size representations consistent throughout
-
+.BR htop .
 .SH "SEE ALSO"
-proc(5), top(1), free(1), ps(1), uptime(1), limits.conf(5)
+.BR proc (5),
-
+.BR top (1),
+.BR free (1),
+.BR ps (1),
+.BR uptime (1)
+and
+.BR limits.conf (5).
 .SH "AUTHORS"
 .LP 
-htop is developed by Hisham Muhammad <hisham@gobolinux.org>.
+.B htop
-.LP
+was originally developed by Hisham Muhammad.
-This man page was written by Bartosz Fenski <fenio@o2.pl> for the Debian
+Nowadays it is maintained by the community at <htop@groups.io>.
-GNU/Linux distribution (but it may be used by others). It was updated by Hisham
-Muhammad, and later by Vincent Launchbury, who wrote the 'Columns' section.

htop.c

@@ -39,10 +39,12 @@ static void printHelpFlag() {
    fputs("htop " VERSION " - " COPYRIGHT "\n"
          "Released under the GNU GPL.\n\n"
          "-C --no-color               Use a monochrome color scheme\n"
+         "-m --no-mouse               Disable the mouse\n"
          "-d --delay=DELAY            Set the delay between updates, in tenths of seconds\n"
          "-h --help                   Print this help screen\n"
          "-s --sort-key=COLUMN        Sort by COLUMN (try --sort-key=help for a list)\n"
-         "-u --user=USERNAME          Show only processes of a given user\n"
+         "-t --tree                   Show the tree view by default\n"
+         "-u --user[=USERNAME]        Show only processes for a given user (or $USER)\n"
          "-p --pid=PID,[,PID,PID...]  Show only the given PIDs\n"
          "-v --version                Print version info\n"
          "\n"
@@ -61,6 +63,8 @@ typedef struct CommandLineSettings_ {
    int sortKey;
    int delay;
    bool useColors;
+   bool enableMouse;
+   bool treeView;
 } CommandLineSettings;
 
 static CommandLineSettings parseArguments(int argc, char** argv) {
@@ -71,6 +75,8 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
       .sortKey = 0,
       .delay = -1,
       .useColors = true,
+      .enableMouse = true,
+      .treeView = false,
    };
 
    static struct option long_opts[] =
@@ -79,17 +85,18 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
       {"version",  no_argument,         0, 'v'},
       {"delay",    required_argument,   0, 'd'},
       {"sort-key", required_argument,   0, 's'},
-      {"user",     required_argument,   0, 'u'},
+      {"user",     optional_argument,   0, 'u'},
       {"no-color", no_argument,         0, 'C'},
       {"no-colour",no_argument,         0, 'C'},
+      {"no-mouse", no_argument,         0, 'm'},
+      {"tree",     no_argument,         0, 't'},
       {"pid",      required_argument,   0, 'p'},
-      {"io",       no_argument,         0, 'i'},
       {0,0,0,0}
    };
 
    int opt, opti=0;
    /* Parse arguments */
-   while ((opt = getopt_long(argc, argv, "hvCs:d:u:p:i", long_opts, &opti))) {
+   while ((opt = getopt_long(argc, argv, "hvmCs:td:u::p:", long_opts, &opti))) {
       if (opt == EOF) break;
       switch (opt) {
          case 'h':
@@ -109,6 +116,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
             flags.sortKey = ColumnsPanel_fieldNameToIndex(optarg);
             if (flags.sortKey == -1) {
                fprintf(stderr, "Error: invalid column \"%s\".\n", optarg);
+               exit(1);
             }
             break;
          case 'd':
@@ -117,16 +125,34 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
                if (flags.delay > 100) flags.delay = 100;
             } else {
                fprintf(stderr, "Error: invalid delay value \"%s\".\n", optarg);
+               exit(1);
             }
             break;
          case 'u':
+            if (!optarg && optind < argc && argv[optind] != NULL &&
+                (argv[optind][0] != '\0' && argv[optind][0] != '-')) {
+               optarg = argv[optind++];
+            }
+
+            if (!optarg) {
+               optarg = getenv("USER");
+               flags.userId = geteuid();
+            }
+
             if (!Action_setUserOnly(optarg, &(flags.userId))) {
                fprintf(stderr, "Error: invalid user \"%s\".\n", optarg);
+               exit(1);
             }
             break;
          case 'C':
             flags.useColors = false;
             break;
+         case 'm':
+            flags.enableMouse = false;
+            break;
+         case 't':
+            flags.treeView = true;
+            break;
          case 'p': {
             char* argCopy = xStrdup(optarg);
             char* saveptr;
@@ -197,6 +223,10 @@ int main(int argc, char** argv) {
       settings->delay = flags.delay;
    if (!flags.useColors)
       settings->colorScheme = COLORSCHEME_MONOCHROME;
+   if (!flags.enableMouse)
+      settings->enableMouse = false;
+   if (flags.treeView)
+      settings->treeView = true;
 
    CRT_init(settings->delay, settings->colorScheme);
 

htop.desktop

@@ -1,41 +1,10 @@
 [Desktop Entry]
+Type=Application
 Version=1.0
 Name=Htop
-Type=Application
-Comment=Show System Processes
-Comment[ca]=Mostra els processos del sistema
-Comment[de]=Systemprozesse anzeigen
-Comment[en_GB]=Show System Processes
-Comment[es]=Mostrar procesos del sistema
-Comment[fi]=Katsele järjestelmän prosesseja
-Comment[fr]=Affiche les processus système
-Comment[gl]=Mostrar os procesos do sistema.
-Comment[it]=Mostra processi di sistema
-Comment[ko]=시스템 프로세스 보기
-Comment[nb]=Vis systemprosesser
-Comment[nl]=Systeemprocessen tonen
-Comment[nn]=Vis systemprosessar
-Comment[pl]=Pokaż procesy systemowe
-Comment[pt]=Mostrar os Processos do Sistema
-Comment[pt_BR]=Mostra os processos do sistema
-Comment[ru]=Просмотр списка процессов в системе
-Comment[sk]=Zobraziť systémové procesy
-Comment[sl]=Prikaz sistemskih opravil
-Comment[sr]=Приказ системских процеса
-Comment[sr@ijekavian]=Приказ системских процеса
-Comment[sr@ijekavianlatin]=Prikaz sistemskih procesa
-Comment[sr@latin]=Prikaz sistemskih procesa
-Comment[sv]=Visa systemprocesser
-Comment[tr]=Sistem Süreçlerini Göster
-Comment[uk]=Перегляд системних процесів
-Comment[zh_CN]=显示系统进程
-Comment[zh_TW]=顯示系統行程
-Terminal=true
-Exec=htop
-Icon=htop
-Categories=ConsoleOnly;System;
 GenericName=Process Viewer
-GenericName[ca]=Visor de processos
+GenericName[ca]=Visualitzador de processos
+GenericName[da]=Procesfremviser
 GenericName[de]=Prozessanzeige
 GenericName[en_GB]=Process Viewer
 GenericName[es]=Visor de procesos
@@ -53,13 +22,46 @@ GenericName[pt_BR]=Visualizador de processos
 GenericName[ru]=Монитор процессов
 GenericName[sk]=Prehliadač procesov
 GenericName[sl]=Pregledovalnik opravil
-GenericName[sr]=Приказивач процеса
 GenericName[sr@ijekavian]=Приказивач процеса
 GenericName[sr@ijekavianlatin]=Prikazivač procesa
 GenericName[sr@latin]=Prikazivač procesa
+GenericName[sr]=Приказивач процеса
 GenericName[sv]=Processvisning
 GenericName[tr]=Süreç Görüntüleyici
 GenericName[uk]=Перегляд процесів
 GenericName[zh_CN]=进程查看器
 GenericName[zh_TW]=行程檢視器
+Comment=Show System Processes
+Comment[ca]=Visualitzeu els processos del sistema
+Comment[da]=Vis systemprocesser
+Comment[de]=Systemprozesse anzeigen
+Comment[en_GB]=Show System Processes
+Comment[es]=Mostrar procesos del sistema
+Comment[fi]=Katsele järjestelmän prosesseja
+Comment[fr]=Affiche les processus système
+Comment[gl]=Mostrar os procesos do sistema.
+Comment[it]=Mostra processi di sistema
+Comment[ko]=시스템 프로세스 보기
+Comment[nb]=Vis systemprosesser
+Comment[nl]=Systeemprocessen tonen
+Comment[nn]=Vis systemprosessar
+Comment[pl]=Pokaż procesy systemowe
+Comment[pt]=Mostrar os Processos do Sistema
+Comment[pt_BR]=Mostra os processos do sistema
+Comment[ru]=Просмотр списка процессов в системе
+Comment[sk]=Zobraziť systémové procesy
+Comment[sl]=Prikaz sistemskih opravil
+Comment[sr@ijekavian]=Приказ системских процеса
+Comment[sr@ijekavianlatin]=Prikaz sistemskih procesa
+Comment[sr@latin]=Prikaz sistemskih procesa
+Comment[sr]=Приказ системских процеса
+Comment[sv]=Visa systemprocesser
+Comment[tr]=Sistem Süreçlerini Göster
+Comment[uk]=Перегляд системних процесів
+Comment[zh_CN]=显示系统进程
+Comment[zh_TW]=顯示系統行程
+Icon=htop
+Exec=htop
+Terminal=true
+Categories=System;Monitor;ConsoleOnly;
 Keywords=system;process;task

htop.h

@@ -14,6 +14,6 @@ in the source distribution for its full text.
 // ----------------------------------------
 
 
-int main(int argc, char** argv);
+extern int main(int argc, char** argv);
 
 #endif

linux/Battery.c

@@ -110,16 +110,13 @@ static ACPresence procAcpiCheck() {
       char statePath[50];
       xSnprintf((char *) statePath, sizeof statePath, "%s/%s/state", power_supplyPath, entryName);
       FILE* file = fopen(statePath, "r");
-
       if (!file) {
          isOn = AC_ERROR;
          continue;
       }
-
       char* line = String_readLine(file);
-      if (!line) continue;
-
       fclose(file);
+      if (!line) continue;
 
       const char *isOnline = String_getToken(line, 2);
       free(line);
@@ -196,8 +193,18 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
       char* entryName = (char *) dirEntry->d_name;
       const char filePath[50];
 
-      if (entryName[0] == 'B' && entryName[1] == 'A' && entryName[2] == 'T') {
+      xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/type", entryName);
+      int fd = open(filePath, O_RDONLY);
+      if (fd == -1)
+         continue;
 
+      char type[8];
+      ssize_t typelen = xread(fd, type, 7);
+      close(fd);
+      if (typelen < 1)
+         continue;
+
+      if (type[0] == 'B' && type[1] == 'a' && type[2] == 't') {
          xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/uevent", entryName);
          int fd = open(filePath, O_RDONLY);
          if (fd == -1) {

linux/Battery.h

@@ -29,6 +29,6 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat
 // READ FROM /sys
 // ----------------------------------------
 
-void Battery_getData(double* level, ACPresence* isOnAC);
+extern void Battery_getData(double* level, ACPresence* isOnAC);
 
 #endif

linux/IOPriorityPanel.h

@@ -13,9 +13,9 @@ in the source distribution for its full text.
 #include "IOPriority.h"
 #include "ListItem.h"
 
-Panel* IOPriorityPanel_new(IOPriority currPrio);
+extern Panel* IOPriorityPanel_new(IOPriority currPrio);
 
-IOPriority IOPriorityPanel_getIOPriority(Panel* this);
+extern IOPriority IOPriorityPanel_getIOPriority(Panel* this);
 
 
 #endif

linux/LinuxCRT.h

@@ -12,6 +12,6 @@ in the source distribution for its full text.
 #ifdef HAVE_EXECINFO_H
 #endif
 
-void CRT_handleSIGSEGV(int sgn);
+extern void CRT_handleSIGSEGV(int sgn);
 
 #endif

linux/LinuxProcess.c

@@ -1,6 +1,7 @@
 /*
 htop - LinuxProcess.c
 (C) 2014 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -15,6 +16,7 @@ in the source distribution for its full text.
 #include <unistd.h>
 #include <string.h>
 #include <sys/syscall.h>
+#include <time.h>
 
 /*{
 
@@ -23,6 +25,7 @@ in the source distribution for its full text.
 #define PROCESS_FLAG_LINUX_VSERVER  0x0400
 #define PROCESS_FLAG_LINUX_CGROUP   0x0800
 #define PROCESS_FLAG_LINUX_OOM      0x1000
+#define PROCESS_FLAG_LINUX_SMAPS    0x2000
 
 typedef enum UnsupportedProcessFields {
    FLAGS = 9,
@@ -86,13 +89,17 @@ typedef enum LinuxProcessFields {
    PERCENT_IO_DELAY = 117,
    PERCENT_SWAP_DELAY = 118,
    #endif
-   LAST_PROCESSFIELD = 119,
+   M_PSS = 119,
+   M_SWAP = 120,
+   M_PSSWP = 121,
+   LAST_PROCESSFIELD = 122,
 } LinuxProcessField;
 
 #include "IOPriority.h"
 
 typedef struct LinuxProcess_ {
    Process super;
+   bool isKernelThread;
    IOPriority ioPriority;
    unsigned long int cminflt;
    unsigned long int cmajflt;
@@ -101,10 +108,14 @@ typedef struct LinuxProcess_ {
    unsigned long long int cutime;
    unsigned long long int cstime;
    long m_share;
+   long m_pss;
+   long m_swap;
+   long m_psswp;
    long m_trs;
    long m_drs;
    long m_lrs;
    long m_dt;
+   unsigned long long starttime;
    #ifdef HAVE_TASKSTATS
    unsigned long long io_rchar;
    unsigned long long io_wchar;
@@ -142,7 +153,7 @@ typedef struct LinuxProcess_ {
 } LinuxProcess;
 
 #ifndef Process_isKernelThread
-#define Process_isKernelThread(_process) (_process->pgrp == 0)
+#define Process_isKernelThread(_process) (((LinuxProcess*)(_process))->isKernelThread)
 #endif
 
 #ifndef Process_isUserlandThread
@@ -151,6 +162,9 @@ typedef struct LinuxProcess_ {
 
 }*/
 
+/* semi-global */
+long long btime;
+
 ProcessFieldData Process_fields[] = {
    [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
    [PID] = { .name = "PID", .title = "    PID ", .description = "Process/thread ID", .flags = 0, },
@@ -198,7 +212,7 @@ ProcessFieldData Process_fields[] = {
    [M_DRS] = { .name = "M_DRS", .title = " DATA ", .description = "Size of the data segment plus stack usage of the process", .flags = 0, },
    [M_LRS] = { .name = "M_LRS", .title = " LIB ", .description = "The library size of the process", .flags = 0, },
    [M_DT] = { .name = "M_DT", .title = " DIRTY ", .description = "Size of the dirty pages of the process", .flags = 0, },
-   [ST_UID] = { .name = "ST_UID", .title = " UID ", .description = "User ID of the process owner", .flags = 0, },
+   [ST_UID] = { .name = "ST_UID", .title = "  UID ", .description = "User ID of the process owner", .flags = 0, },
    [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = "CPU% ", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, },
    [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, },
    [USER] = { .name = "USER", .title = "USER      ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
@@ -234,6 +248,9 @@ ProcessFieldData Process_fields[] = {
    [PERCENT_IO_DELAY] = { .name = "PERCENT_IO_DELAY", .title = "IOD% ", .description = "Block I/O delay %", .flags = 0, },
    [PERCENT_SWAP_DELAY] = { .name = "PERCENT_SWAP_DELAY", .title = "SWAPD% ", .description = "Swapin delay %", .flags = 0, },
 #endif
+   [M_PSS] = { .name = "M_PSS", .title = "  PSS ", .description = "proportional set size, same as M_RESIDENT but each page is divided by the number of processes sharing it.", .flags = PROCESS_FLAG_LINUX_SMAPS, },
+   [M_SWAP] = { .name = "M_SWAP", .title = " SWAP ", .description = "Size of the process's swapped pages", .flags = PROCESS_FLAG_LINUX_SMAPS, },
+   [M_PSSWP] = { .name = "M_PSSWP", .title = " PSSWP ", .description = "shows proportional swap share of this mapping, Unlike \"Swap\", this does not take into account swapped out page of underlying shmem objects.", .flags = PROCESS_FLAG_LINUX_SMAPS, },
    [LAST_PROCESSFIELD] = { .name = "*** report bug! ***", .title = NULL, .description = NULL, .flags = 0, },
 };
 
@@ -298,12 +315,12 @@ IOPriority LinuxProcess_updateIOPriority(LinuxProcess* this) {
    return ioprio;
 }
 
-bool LinuxProcess_setIOPriority(LinuxProcess* this, IOPriority ioprio) {
+bool LinuxProcess_setIOPriority(LinuxProcess* this, Arg ioprio) {
 // Other OSes masquerading as Linux (NetBSD?) don't have this syscall
 #ifdef SYS_ioprio_set
-   syscall(SYS_ioprio_set, IOPRIO_WHO_PROCESS, this->super.pid, ioprio);
+   syscall(SYS_ioprio_set, IOPRIO_WHO_PROCESS, this->super.pid, ioprio.i);
 #endif
-   return (LinuxProcess_updateIOPriority(this) == ioprio);
+   return (LinuxProcess_updateIOPriority(this) == ioprio.i);
 }
 
 #ifdef HAVE_DELAYACCT
@@ -339,10 +356,20 @@ void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field)
    case M_LRS: Process_humanNumber(str, lp->m_lrs * PAGE_SIZE_KB, coloring); return;
    case M_TRS: Process_humanNumber(str, lp->m_trs * PAGE_SIZE_KB, coloring); return;
    case M_SHARE: Process_humanNumber(str, lp->m_share * PAGE_SIZE_KB, coloring); return;
+   case M_PSS: Process_humanNumber(str, lp->m_pss, coloring); return;
+   case M_SWAP: Process_humanNumber(str, lp->m_swap, coloring); return;
+   case M_PSSWP: Process_humanNumber(str, lp->m_psswp, coloring); return;
    case UTIME: Process_printTime(str, lp->utime); return;
    case STIME: Process_printTime(str, lp->stime); return;
    case CUTIME: Process_printTime(str, lp->cutime); return;
    case CSTIME: Process_printTime(str, lp->cstime); return;
+   case STARTTIME: {
+     struct tm date;
+     time_t starttimewall = btime + (lp->starttime / sysconf(_SC_CLK_TCK));
+     (void) localtime_r(&starttimewall, &date);
+     strftime(buffer, n, ((starttimewall > time(NULL) - 86400) ? "%R " : "%b%d "), &date);
+     break;
+   }
    #ifdef HAVE_TASKSTATS
    case RCHAR:  Process_colorNumber(str, lp->io_rchar, coloring); return;
    case WCHAR:  Process_colorNumber(str, lp->io_wchar, coloring); return;
@@ -423,10 +450,22 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
       return (p2->m_trs - p1->m_trs);
    case M_SHARE:
       return (p2->m_share - p1->m_share);
+   case M_PSS:
+      return (p2->m_pss - p1->m_pss);
+   case M_SWAP:
+      return (p2->m_swap - p1->m_swap);
+   case M_PSSWP:
+      return (p2->m_psswp - p1->m_psswp);
    case UTIME:  diff = p2->utime - p1->utime; goto test_diff;
    case CUTIME: diff = p2->cutime - p1->cutime; goto test_diff;
    case STIME:  diff = p2->stime - p1->stime; goto test_diff;
    case CSTIME: diff = p2->cstime - p1->cstime; goto test_diff;
+   case STARTTIME: {
+      if (p1->starttime == p2->starttime)
+         return (p1->super.pid - p2->super.pid);
+      else
+         return (p1->starttime - p2->starttime);
+   }
    #ifdef HAVE_TASKSTATS
    case RCHAR:  diff = p2->io_rchar - p1->io_rchar; goto test_diff;
    case WCHAR:  diff = p2->io_wchar - p1->io_wchar; goto test_diff;

linux/LinuxProcess.h

@@ -5,6 +5,7 @@
 /*
 htop - LinuxProcess.h
 (C) 2014 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -15,6 +16,7 @@ in the source distribution for its full text.
 #define PROCESS_FLAG_LINUX_VSERVER  0x0400
 #define PROCESS_FLAG_LINUX_CGROUP   0x0800
 #define PROCESS_FLAG_LINUX_OOM      0x1000
+#define PROCESS_FLAG_LINUX_SMAPS    0x2000
 
 typedef enum UnsupportedProcessFields {
    FLAGS = 9,
@@ -78,13 +80,17 @@ typedef enum LinuxProcessFields {
    PERCENT_IO_DELAY = 117,
    PERCENT_SWAP_DELAY = 118,
    #endif
-   LAST_PROCESSFIELD = 119,
+   M_PSS = 119,
+   M_SWAP = 120,
+   M_PSSWP = 121,
+   LAST_PROCESSFIELD = 122,
 } LinuxProcessField;
 
 #include "IOPriority.h"
 
 typedef struct LinuxProcess_ {
    Process super;
+   bool isKernelThread;
    IOPriority ioPriority;
    unsigned long int cminflt;
    unsigned long int cmajflt;
@@ -93,10 +99,14 @@ typedef struct LinuxProcess_ {
    unsigned long long int cutime;
    unsigned long long int cstime;
    long m_share;
+   long m_pss;
+   long m_swap;
+   long m_psswp;
    long m_trs;
    long m_drs;
    long m_lrs;
    long m_dt;
+   unsigned long long starttime;
    #ifdef HAVE_TASKSTATS
    unsigned long long io_rchar;
    unsigned long long io_wchar;
@@ -134,7 +144,7 @@ typedef struct LinuxProcess_ {
 } LinuxProcess;
 
 #ifndef Process_isKernelThread
-#define Process_isKernelThread(_process) (_process->pgrp == 0)
+#define Process_isKernelThread(_process) (((LinuxProcess*)(_process))->isKernelThread)
 #endif
 
 #ifndef Process_isUserlandThread
@@ -142,15 +152,18 @@ typedef struct LinuxProcess_ {
 #endif
 
 
+/* semi-global */
+extern long long btime;
+
 extern ProcessFieldData Process_fields[];
 
 extern ProcessPidColumn Process_pidColumns[];
 
 extern ProcessClass LinuxProcess_class;
 
-LinuxProcess* LinuxProcess_new(Settings* settings);
+extern LinuxProcess* LinuxProcess_new(Settings* settings);
 
-void Process_delete(Object* cast);
+extern void Process_delete(Object* cast);
 
 /*
 [1] Note that before kernel 2.6.26 a process that has not asked for
@@ -162,19 +175,19 @@ extern io_priority;
 */
 #define LinuxProcess_effectiveIOPriority(p_) (IOPriority_class(p_->ioPriority) == IOPRIO_CLASS_NONE ? IOPriority_tuple(IOPRIO_CLASS_BE, (p_->super.nice + 20) / 5) : p_->ioPriority)
 
-IOPriority LinuxProcess_updateIOPriority(LinuxProcess* this);
+extern IOPriority LinuxProcess_updateIOPriority(LinuxProcess* this);
 
-bool LinuxProcess_setIOPriority(LinuxProcess* this, IOPriority ioprio);
+extern bool LinuxProcess_setIOPriority(LinuxProcess* this, Arg ioprio);
 
 #ifdef HAVE_DELAYACCT
-void LinuxProcess_printDelay(float delay_percent, char* buffer, int n);
+extern void LinuxProcess_printDelay(float delay_percent, char* buffer, int n);
 #endif
 
-void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field);
+extern void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field);
 
-long LinuxProcess_compare(const void* v1, const void* v2);
+extern long LinuxProcess_compare(const void* v1, const void* v2);
 
-bool Process_isThread(Process* this);
+extern bool Process_isThread(Process* this);
 
 
 #endif

linux/LinuxProcessList.c

@@ -26,6 +26,11 @@ in the source distribution for its full text.
 #include <assert.h>
 #include <sys/types.h>
 #include <fcntl.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#endif
 
 #ifdef HAVE_DELAYACCT
 #include <netlink/attr.h>
@@ -40,6 +45,9 @@ in the source distribution for its full text.
 /*{
 
 #include "ProcessList.h"
+#include "zfs/ZfsArcStats.h"
+
+extern long long btime;
 
 typedef struct CPUData_ {
    unsigned long long int totalTime;
@@ -67,6 +75,8 @@ typedef struct CPUData_ {
    unsigned long long int softIrqPeriod;
    unsigned long long int stealPeriod;
    unsigned long long int guestPeriod;
+
+   double frequency;
 } CPUData;
 
 typedef struct TtyDriver_ {
@@ -81,17 +91,24 @@ typedef struct LinuxProcessList_ {
 
    CPUData* cpus;
    TtyDriver* ttyDrivers;
+   bool haveSmapsRollup;
 
    #ifdef HAVE_DELAYACCT
    struct nl_sock *netlink_socket;
    int netlink_family;
    #endif
+
+   ZfsArcStats zfs;
 } LinuxProcessList;
 
 #ifndef PROCDIR
 #define PROCDIR "/proc"
 #endif
 
+#ifndef PROCCPUINFOFILE
+#define PROCCPUINFOFILE PROCDIR "/cpuinfo"
+#endif
+
 #ifndef PROCSTATFILE
 #define PROCSTATFILE PROCDIR "/stat"
 #endif
@@ -100,12 +117,16 @@ typedef struct LinuxProcessList_ {
 #define PROCMEMINFOFILE PROCDIR "/meminfo"
 #endif
 
+#ifndef PROCARCSTATSFILE
+#define PROCARCSTATSFILE PROCDIR "/spl/kstat/zfs/arcstats"
+#endif
+
 #ifndef PROCTTYDRIVERSFILE
 #define PROCTTYDRIVERSFILE PROCDIR "/tty/drivers"
 #endif
 
 #ifndef PROC_LINE_LENGTH
-#define PROC_LINE_LENGTH 512
+#define PROC_LINE_LENGTH 4096
 #endif
 
 }*/
@@ -224,26 +245,41 @@ static void LinuxProcessList_initNetlinkSocket(LinuxProcessList* this) {
 ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
    LinuxProcessList* this = xCalloc(1, sizeof(LinuxProcessList));
    ProcessList* pl = &(this->super);
-   ProcessList_init(pl, Class(LinuxProcess), usersTable, pidWhiteList, userId);
 
+   ProcessList_init(pl, Class(LinuxProcess), usersTable, pidWhiteList, userId);
    LinuxProcessList_initTtyDrivers(this);
 
    #ifdef HAVE_DELAYACCT
    LinuxProcessList_initNetlinkSocket(this);
    #endif
 
+   // Check for /proc/*/smaps_rollup availability (improves smaps parsing speed, Linux 4.14+)
+   FILE* file = fopen(PROCDIR "/self/smaps_rollup", "r");
+   if(file != NULL) {
+      this->haveSmapsRollup = true;
+      fclose(file);
+   } else {
+      this->haveSmapsRollup = false;
+   }
+
    // Update CPU count:
-   FILE* file = fopen(PROCSTATFILE, "r");
+   file = fopen(PROCSTATFILE, "r");
    if (file == NULL) {
       CRT_fatalError("Cannot open " PROCSTATFILE);
    }
-   char buffer[PROC_LINE_LENGTH + 1];
+   int cpus = 0;
-   int cpus = -1;
    do {
-      cpus++;
+      char buffer[PROC_LINE_LENGTH + 1];
-      char * s = fgets(buffer, PROC_LINE_LENGTH, file);
+      if (fgets(buffer, PROC_LINE_LENGTH + 1, file) == NULL) {
-      (void) s;
+         CRT_fatalError("No btime in " PROCSTATFILE);
-   } while (String_startsWith(buffer, "cpu"));
+      } else if (String_startsWith(buffer, "cpu")) {
+         cpus++;
+      } else if (String_startsWith(buffer, "btime ")) {
+         sscanf(buffer, "btime %lld\n", &btime);
+         break;
+      }
+   } while(true);
+
    fclose(file);
 
    pl->cpuCount = MAX(cpus - 1, 1);
@@ -253,7 +289,6 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
       this->cpus[i].totalTime = 1;
       this->cpus[i].totalPeriod = 1;
    }
-
    return pl;
 }
 
@@ -349,7 +384,10 @@ static bool LinuxProcessList_readStatFile(Process *process, const char* dirname,
    location += 1;
    process->nlwp = strtol(location, &location, 10);
    location += 1;
-   for (int i=0; i<17; i++) location = strchr(location, ' ')+1;
+   location = strchr(location, ' ')+1;
+   lp->starttime = strtoll(location, &location, 10);
+   location += 1;
+   for (int i=0; i<15; i++) location = strchr(location, ' ')+1;
    process->exit_signal = strtol(location, &location, 10);
    location += 1;
    assert(location != NULL);
@@ -361,7 +399,7 @@ static bool LinuxProcessList_readStatFile(Process *process, const char* dirname,
 }
 
 
-static bool LinuxProcessList_statProcessDir(Process* process, const char* dirname, char* name, time_t curTime) {
+static bool LinuxProcessList_statProcessDir(Process* process, const char* dirname, char* name) {
    char filename[MAX_NAME+1];
    filename[MAX_NAME] = '\0';
 
@@ -371,13 +409,6 @@ static bool LinuxProcessList_statProcessDir(Process* process, const char* dirnam
    if (statok == -1)
       return false;
    process->st_uid = sstat.st_uid;
-  
-   struct tm date;
-   time_t ctime = sstat.st_ctime;
-   process->starttime_ctime = ctime;
-   (void) localtime_r((time_t*) &ctime, &date);
-   strftime(process->starttime_show, 7, ((ctime > curTime - 86400) ? "%R " : "%b%d "), &date);
-   
    return true;
 }
 
@@ -436,7 +467,7 @@ static void LinuxProcessList_readIoFile(LinuxProcess* process, const char* dirna
          }
          break;
       case 's':
-         if (line[5] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
+         if (line[4] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
             process->io_syscr = strtoull(line+7, NULL, 10);
          } else if (strncmp(line+1, "yscw: ", 6) == 0) {
             process->io_syscw = strtoull(line+7, NULL, 10);
@@ -477,6 +508,62 @@ static bool LinuxProcessList_readStatmFile(LinuxProcess* process, const char* di
    return (errno == 0);
 }
 
+static bool LinuxProcessList_readSmapsFile(LinuxProcess* process, const char* dirname, const char* name, bool haveSmapsRollup) {
+   //http://elixir.free-electrons.com/linux/v4.10/source/fs/proc/task_mmu.c#L719
+   //kernel will return data in chunks of size PAGE_SIZE or less.
+
+   char buffer[PAGE_SIZE];// 4k
+   char *start,*end;
+   ssize_t nread=0;
+   int tmp=0;
+   if(haveSmapsRollup) {// only available in Linux 4.14+
+      snprintf(buffer, PAGE_SIZE-1, "%s/%s/smaps_rollup", dirname, name);
+   } else {
+      snprintf(buffer, PAGE_SIZE-1, "%s/%s/smaps", dirname, name);
+   }
+   int fd = open(buffer, O_RDONLY);
+   if (fd == -1)
+      return false;
+
+   process->m_pss   = 0;
+   process->m_swap  = 0;
+   process->m_psswp = 0;
+
+   while ( ( nread =  read(fd,buffer, sizeof(buffer)) ) > 0 ){
+        start = (char *)&buffer;
+        end   = start + nread;
+        do{//parse 4k block
+
+            if( (tmp = (end - start)) > 0 &&
+                (start = memmem(start,tmp,"\nPss:",5)) != NULL )
+            {
+              process->m_pss += strtol(start+5, &start, 10);
+              start += 3;//now we must be at the end of line "Pss:                   0 kB"
+            }else
+              break; //read next 4k block
+
+            if( (tmp = (end - start)) > 0 &&
+                (start = memmem(start,tmp,"\nSwap:",6)) != NULL )
+            {
+              process->m_swap += strtol(start+6, &start, 10);
+              start += 3;
+            }else
+              break;
+
+            if( (tmp = (end - start)) > 0 &&
+                (start = memmem(start,tmp,"\nSwapPss:",9)) != NULL )
+            {
+              process->m_psswp += strtol(start+9, &start, 10);
+              start += 3;
+            }else
+              break;
+
+        }while(1);
+   }//while read
+   close(fd);
+   return true;
+}
+
 #ifdef HAVE_OPENVZ
 
 static void LinuxProcessList_readOpenVZData(LinuxProcess* process, const char* dirname, const char* name) {
@@ -595,36 +682,36 @@ static void LinuxProcessList_readOomData(LinuxProcess* process, const char* dirn
 
 static int handleNetlinkMsg(struct nl_msg *nlmsg, void *linuxProcess) {
    struct nlmsghdr *nlhdr;
-  	struct nlattr *nlattrs[TASKSTATS_TYPE_MAX + 1];
+   struct nlattr *nlattrs[TASKSTATS_TYPE_MAX + 1];
-  	struct nlattr *nlattr;
+   struct nlattr *nlattr;
-	struct taskstats *stats;
+   struct taskstats *stats;
-	int rem;
+   int rem;
-	unsigned long long int timeDelta;
+   unsigned long long int timeDelta;
-	LinuxProcess* lp = (LinuxProcess*) linuxProcess;
+   LinuxProcess* lp = (LinuxProcess*) linuxProcess;
 
-	nlhdr = nlmsg_hdr(nlmsg);
+   nlhdr = nlmsg_hdr(nlmsg);
 
    if (genlmsg_parse(nlhdr, 0, nlattrs, TASKSTATS_TYPE_MAX, NULL) < 0) {
       return NL_SKIP;
-	}
+   }
 
-	if ((nlattr = nlattrs[TASKSTATS_TYPE_AGGR_PID]) || (nlattr = nlattrs[TASKSTATS_TYPE_NULL])) {
+   if ((nlattr = nlattrs[TASKSTATS_TYPE_AGGR_PID]) || (nlattr = nlattrs[TASKSTATS_TYPE_NULL])) {
-		stats = nla_data(nla_next(nla_data(nlattr), &rem));
+      stats = nla_data(nla_next(nla_data(nlattr), &rem));
-		assert(lp->super.pid == stats->ac_pid);
+      assert(lp->super.pid == stats->ac_pid);
-		timeDelta = (stats->ac_etime*1000 - lp->delay_read_time);
+      timeDelta = (stats->ac_etime*1000 - lp->delay_read_time);
-		#define BOUNDS(x) isnan(x) ? 0.0 : (x > 100) ? 100.0 : x;
+      #define BOUNDS(x) isnan(x) ? 0.0 : (x > 100) ? 100.0 : x;
-		#define DELTAPERC(x,y) BOUNDS((float) (x - y) / timeDelta * 100);
+      #define DELTAPERC(x,y) BOUNDS((float) (x - y) / timeDelta * 100);
-		lp->cpu_delay_percent = DELTAPERC(stats->cpu_delay_total, lp->cpu_delay_total);
+      lp->cpu_delay_percent = DELTAPERC(stats->cpu_delay_total, lp->cpu_delay_total);
-		lp->blkio_delay_percent = DELTAPERC(stats->blkio_delay_total, lp->blkio_delay_total);
+      lp->blkio_delay_percent = DELTAPERC(stats->blkio_delay_total, lp->blkio_delay_total);
-		lp->swapin_delay_percent = DELTAPERC(stats->swapin_delay_total, lp->swapin_delay_total);
+      lp->swapin_delay_percent = DELTAPERC(stats->swapin_delay_total, lp->swapin_delay_total);
-		#undef DELTAPERC
+      #undef DELTAPERC
-		#undef BOUNDS
+      #undef BOUNDS
-		lp->swapin_delay_total = stats->swapin_delay_total;
+      lp->swapin_delay_total = stats->swapin_delay_total;
-		lp->blkio_delay_total = stats->blkio_delay_total;
+      lp->blkio_delay_total = stats->blkio_delay_total;
-		lp->cpu_delay_total = stats->cpu_delay_total;
+      lp->cpu_delay_total = stats->cpu_delay_total;
-		lp->delay_read_time = stats->ac_etime*1000;
+      lp->delay_read_time = stats->ac_etime*1000;
-	}
+   }
-  	return NL_OK;
+   return NL_OK;
 }
 
 static void LinuxProcessList_readDelayAcctData(LinuxProcessList* this, LinuxProcess* process) {
@@ -671,9 +758,6 @@ static void setCommand(Process* process, const char* command, int len) {
 }
 
 static bool LinuxProcessList_readCmdlineFile(Process* process, const char* dirname, const char* name) {
-   if (Process_isKernelThread(process))
-      return true;
-
    char filename[MAX_NAME+1];
    xSnprintf(filename, MAX_NAME, "%s/%s/cmdline", dirname, name);
    int fd = open(filename, O_RDONLY);
@@ -685,7 +769,14 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, const char* dirna
    close(fd);
    int tokenEnd = 0;
    int lastChar = 0;
-   if (amtRead <= 0) {
+   if (amtRead == 0) {
+      if (process->state == 'Z') {
+         process->basenameOffset = 0;
+      } else {
+         ((LinuxProcess*)process)->isKernelThread = true;
+      }
+      return true;
+   } else if (amtRead < 0) {
       return false;
    }
    for (int i = 0; i < amtRead; i++) {
@@ -703,7 +794,7 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, const char* dirna
    }
    command[lastChar + 1] = '\0';
    process->basenameOffset = tokenEnd;
-   setCommand(process, command, lastChar);
+   setCommand(process, command, lastChar + 1);
 
    return true;
 }
@@ -756,7 +847,6 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
    struct dirent* entry;
    Settings* settings = pl->settings;
 
-   time_t curTime = tv.tv_sec;
    #ifdef HAVE_TASKSTATS
    unsigned long long now = tv.tv_sec*1000LL+tv.tv_usec/1000LL;
    #endif
@@ -807,6 +897,21 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
       if (! LinuxProcessList_readStatmFile(lp, dirname, name))
          goto errorReadingProcess;
 
+      if ((settings->flags & PROCESS_FLAG_LINUX_SMAPS) && !Process_isKernelThread(proc)){
+         if (!parent){
+            // Read smaps file of each process only every second pass to improve performance
+            static int smaps_flag = 0;
+            if ((pid & 1) == smaps_flag){
+              LinuxProcessList_readSmapsFile(lp, dirname, name, this->haveSmapsRollup);
+            }
+            if (pid == 1) {
+               smaps_flag = !smaps_flag;
+            }
+        } else {
+            lp->m_pss = ((LinuxProcess*)parent)->m_pss;
+        }
+      }
+
       proc->show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));
 
       char command[MAX_NAME+1];
@@ -828,7 +933,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
 
       if(!preExisting) {
 
-         if (! LinuxProcessList_statProcessDir(proc, dirname, name, curTime))
+         if (! LinuxProcessList_statProcessDir(proc, dirname, name))
             goto errorReadingProcess;
 
          proc->user = UsersTable_getRef(pl->usersTable, proc->st_uid);
@@ -919,30 +1024,30 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) {
    char buffer[128];
    while (fgets(buffer, 128, file)) {
 
-      #define tryRead(label, variable) (String_startsWith(buffer, label) && sscanf(buffer + strlen(label), " %32llu kB", variable))
+      #define tryRead(label, variable) do { if (String_startsWith(buffer, label) && sscanf(buffer + strlen(label), " %32llu kB", variable)) { break; } } while(0)
       switch (buffer[0]) {
       case 'M':
-         if (tryRead("MemTotal:", &this->totalMem)) {}
+         tryRead("MemTotal:", &this->totalMem);
-         else if (tryRead("MemFree:", &this->freeMem)) {}
+         tryRead("MemFree:", &this->freeMem);
-         else if (tryRead("MemShared:", &this->sharedMem)) {}
+         tryRead("MemShared:", &this->sharedMem);
          break;
       case 'B':
-         if (tryRead("Buffers:", &this->buffersMem)) {}
+         tryRead("Buffers:", &this->buffersMem);
          break;
       case 'C':
-         if (tryRead("Cached:", &this->cachedMem)) {}
+         tryRead("Cached:", &this->cachedMem);
          break;
       case 'S':
          switch (buffer[1]) {
          case 'w':
-            if (tryRead("SwapTotal:", &this->totalSwap)) {}
+            tryRead("SwapTotal:", &this->totalSwap);
-            else if (tryRead("SwapFree:", &swapFree)) {}
+            tryRead("SwapFree:", &swapFree);
             break;
          case 'h':
-            if (tryRead("Shmem:", &shmem)) {}
+            tryRead("Shmem:", &shmem);
             break;
          case 'R':
-            if (tryRead("SReclaimable:", &sreclaimable)) {}
+            tryRead("SReclaimable:", &sreclaimable);
             break;
          }
          break;
@@ -956,6 +1061,68 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) {
    fclose(file);
 }
 
+static inline void LinuxProcessList_scanZfsArcstats(LinuxProcessList* lpl) {
+   unsigned long long int dbufSize;
+   unsigned long long int dnodeSize;
+   unsigned long long int bonusSize;
+
+   FILE* file = fopen(PROCARCSTATSFILE, "r");
+   if (file == NULL) {
+      lpl->zfs.enabled = 0;
+      return;
+   }
+   char buffer[128];
+   while (fgets(buffer, 128, file)) {
+      #define tryRead(label, variable) do { if (String_startsWith(buffer, label) && sscanf(buffer + strlen(label), " %*2u %32llu", variable)) { break; } } while(0)
+      #define tryReadFlag(label, variable, flag) do { if (String_startsWith(buffer, label) && sscanf(buffer + strlen(label), " %*2u %32llu", variable)) { flag = 1; break; } else { flag = 0; } } while(0)
+      switch (buffer[0]) {
+      case 'c':
+         tryRead("c_max", &lpl->zfs.max);
+         tryReadFlag("compressed_size", &lpl->zfs.compressed, lpl->zfs.isCompressed);
+         break;
+      case 'u':
+         tryRead("uncompressed_size", &lpl->zfs.uncompressed);
+         break;
+      case 's':
+         tryRead("size", &lpl->zfs.size);
+         break;
+      case 'h':
+         tryRead("hdr_size", &lpl->zfs.header);
+         break;
+      case 'd':
+         tryRead("dbuf_size", &dbufSize);
+         tryRead("dnode_size", &dnodeSize);
+         break;
+      case 'b':
+         tryRead("bonus_size", &bonusSize);
+         break;
+      case 'a':
+         tryRead("anon_size", &lpl->zfs.anon);
+         break;
+      case 'm':
+         tryRead("mfu_size", &lpl->zfs.MFU);
+         tryRead("mru_size", &lpl->zfs.MRU);
+         break;
+      }
+      #undef tryRead
+      #undef tryReadFlag
+   }
+   fclose(file);
+
+   lpl->zfs.enabled = (lpl->zfs.size > 0 ? 1 : 0);
+   lpl->zfs.size    /= 1024;
+   lpl->zfs.max    /= 1024;
+   lpl->zfs.MFU    /= 1024;
+   lpl->zfs.MRU    /= 1024;
+   lpl->zfs.anon   /= 1024;
+   lpl->zfs.header /= 1024;
+   lpl->zfs.other   = (dbufSize + dnodeSize + bonusSize) / 1024;
+   if ( lpl->zfs.isCompressed ) {
+      lpl->zfs.compressed /= 1024;
+      lpl->zfs.uncompressed /= 1024;
+   }
+}
+
 static inline double LinuxProcessList_scanCPUTime(LinuxProcessList* this) {
 
    FILE* file = fopen(PROCSTATFILE, "r");
@@ -1020,18 +1187,87 @@ static inline double LinuxProcessList_scanCPUTime(LinuxProcessList* this) {
       cpuData->stealTime = steal;
       cpuData->guestTime = virtalltime;
       cpuData->totalTime = totaltime;
+
    }
    double period = (double)this->cpus[0].totalPeriod / cpus;
    fclose(file);
    return period;
 }
 
+static inline double LinuxProcessList_scanCPUFrequency(LinuxProcessList* this) {
+   ProcessList* pl = (ProcessList*) this;
+   Settings* settings = pl->settings;
+
+   int cpus = this->super.cpuCount;
+   assert(cpus > 0);
+
+   for (int i = 0; i <= cpus; i++) {
+      CPUData* cpuData = &(this->cpus[i]);
+      cpuData->frequency = -1;
+   }
+
+   int numCPUsWithFrequency = 0;
+   double totalFrequency = 0;
+
+   if (settings->showCPUFrequency) {
+      FILE* file = fopen(PROCCPUINFOFILE, "r");
+      if (file == NULL) {
+         CRT_fatalError("Cannot open " PROCCPUINFOFILE);
+      }
+
+      int cpuid = -1;
+      double frequency;
+      while (!feof(file)) {
+         char buffer[PROC_LINE_LENGTH];
+         char *ok = fgets(buffer, PROC_LINE_LENGTH, file);
+         if (!ok) break;
+
+         if (
+            (sscanf(buffer, "processor : %d", &cpuid) == 1) ||
+            (sscanf(buffer, "processor: %d", &cpuid) == 1)
+         ) {
+            if (cpuid < 0 || cpuid > (cpus - 1)) {
+               char buffer[64];
+               xSnprintf(buffer, sizeof(buffer), PROCCPUINFOFILE " contains out-of-range CPU number %d", cpuid);
+               CRT_fatalError(buffer);
+            }
+         } else if (
+            (sscanf(buffer, "cpu MHz : %lf", &frequency) == 1) ||
+            (sscanf(buffer, "cpu MHz: %lf", &frequency) == 1)
+         ) {
+            if (cpuid < 0) {
+               CRT_fatalError(PROCCPUINFOFILE " is malformed: cpu MHz line without corresponding processor line");
+            }
+
+            int cpu = cpuid + 1;
+            CPUData* cpuData = &(this->cpus[cpu]);
+            cpuData->frequency = frequency;
+            numCPUsWithFrequency++;
+            totalFrequency += frequency;
+         } else if (buffer[0] == '\n') {
+            cpuid = -1;
+         }
+      }
+      fclose(file);
+
+      if (numCPUsWithFrequency > 0) {
+         this->cpus[0].frequency = totalFrequency / numCPUsWithFrequency;
+      }
+   }
+
+   double period = (double)this->cpus[0].totalPeriod / cpus;
+   return period;
+}
+
 void ProcessList_goThroughEntries(ProcessList* super) {
    LinuxProcessList* this = (LinuxProcessList*) super;
 
    LinuxProcessList_scanMemoryInfo(super);
+   LinuxProcessList_scanZfsArcstats(this);
    double period = LinuxProcessList_scanCPUTime(this);
 
+   LinuxProcessList_scanCPUFrequency(this);
+
    struct timeval tv;
    gettimeofday(&tv, NULL);
    LinuxProcessList_recurseProcTree(this, PROCDIR, NULL, period, tv);

linux/LinuxProcessList.h

@@ -9,11 +9,18 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
+#ifdef MAJOR_IN_MKDEV
+#elif defined(MAJOR_IN_SYSMACROS)
+#endif
+
 #ifdef HAVE_DELAYACCT
 #endif
 
 
 #include "ProcessList.h"
+#include "zfs/ZfsArcStats.h"
+
+extern long long btime;
 
 typedef struct CPUData_ {
    unsigned long long int totalTime;
@@ -41,6 +48,8 @@ typedef struct CPUData_ {
    unsigned long long int softIrqPeriod;
    unsigned long long int stealPeriod;
    unsigned long long int guestPeriod;
+
+   double frequency;
 } CPUData;
 
 typedef struct TtyDriver_ {
@@ -55,17 +64,24 @@ typedef struct LinuxProcessList_ {
 
    CPUData* cpus;
    TtyDriver* ttyDrivers;
+   bool haveSmapsRollup;
 
    #ifdef HAVE_DELAYACCT
    struct nl_sock *netlink_socket;
    int netlink_family;
    #endif
+
+   ZfsArcStats zfs;
 } LinuxProcessList;
 
 #ifndef PROCDIR
 #define PROCDIR "/proc"
 #endif
 
+#ifndef PROCCPUINFOFILE
+#define PROCCPUINFOFILE PROCDIR "/cpuinfo"
+#endif
+
 #ifndef PROCSTATFILE
 #define PROCSTATFILE PROCDIR "/stat"
 #endif
@@ -74,12 +90,16 @@ typedef struct LinuxProcessList_ {
 #define PROCMEMINFOFILE PROCDIR "/meminfo"
 #endif
 
+#ifndef PROCARCSTATSFILE
+#define PROCARCSTATSFILE PROCDIR "/spl/kstat/zfs/arcstats"
+#endif
+
 #ifndef PROCTTYDRIVERSFILE
 #define PROCTTYDRIVERSFILE PROCDIR "/tty/drivers"
 #endif
 
 #ifndef PROC_LINE_LENGTH
-#define PROC_LINE_LENGTH 512
+#define PROC_LINE_LENGTH 4096
 #endif
 
 
@@ -91,9 +111,9 @@ typedef struct LinuxProcessList_ {
 
 #endif
 
-ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
+extern ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId);
 
-void ProcessList_delete(ProcessList* pl);
+extern void ProcessList_delete(ProcessList* pl);
 
 
 #ifdef HAVE_TASKSTATS
@@ -116,6 +136,6 @@ void ProcessList_delete(ProcessList* pl);
 
 #endif
 
-void ProcessList_goThroughEntries(ProcessList* super);
+extern void ProcessList_goThroughEntries(ProcessList* super);
 
 #endif

linux/Platform.c

@@ -19,8 +19,11 @@ in the source distribution for its full text.
 #include "TasksMeter.h"
 #include "LoadAverageMeter.h"
 #include "UptimeMeter.h"
+#include "PressureStallMeter.h"
 #include "ClockMeter.h"
 #include "HostnameMeter.h"
+#include "zfs/ZfsArcMeter.h"
+#include "zfs/ZfsCompressedArcMeter.h"
 #include "LinuxProcess.h"
 
 #include <math.h>
@@ -93,10 +96,10 @@ static Htop_Reaction Platform_actionSetIOPriority(State* st) {
    if (!p) return HTOP_OK;
    IOPriority ioprio = p->ioPriority;
    Panel* ioprioPanel = IOPriorityPanel_new(ioprio);
-   void* set = Action_pickFromVector(st, ioprioPanel, 21);
+   void* set = Action_pickFromVector(st, ioprioPanel, 21, true);
    if (set) {
       IOPriority ioprio = IOPriorityPanel_getIOPriority(ioprioPanel);
-      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) LinuxProcess_setIOPriority, (size_t) ioprio, NULL);
+      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) LinuxProcess_setIOPriority, (Arg){ .i = ioprio }, NULL);
       if (!ok)
          beep();
    }
@@ -121,11 +124,21 @@ MeterClass* Platform_meterTypes[] = {
    &HostnameMeter_class,
    &AllCPUsMeter_class,
    &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
    &LeftCPUsMeter_class,
    &RightCPUsMeter_class,
    &LeftCPUs2Meter_class,
    &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
    &BlankMeter_class,
+   &PressureStallCPUSomeMeter_class,
+   &PressureStallIOSomeMeter_class,
+   &PressureStallIOFullMeter_class,
+   &PressureStallMemorySomeMeter_class,
+   &PressureStallMemoryFullMeter_class,
+   &ZfsArcMeter_class,
+   &ZfsCompressedArcMeter_class,
    NULL
 };
 
@@ -192,6 +205,9 @@ double Platform_setCPUValues(Meter* this, int cpu) {
    }
    percent = CLAMP(percent, 0.0, 100.0);
    if (isnan(percent)) percent = 0.0;
+
+   v[CPU_METER_FREQUENCY] = cpuData->frequency;
+
    return percent;
 }
 
@@ -213,6 +229,17 @@ void Platform_setSwapValues(Meter* this) {
    this->values[0] = pl->usedSwap;
 }
 
+void Platform_setZfsArcValues(Meter* this) {
+   LinuxProcessList* lpl = (LinuxProcessList*) this->pl;
+
+   ZfsArcMeter_readStats(this, &(lpl->zfs));
+}
+
+void Platform_setZfsCompressedArcValues(Meter* this) {
+   LinuxProcessList* lpl = (LinuxProcessList*) this->pl;
+
+   ZfsCompressedArcMeter_readStats(this, &(lpl->zfs));
+}
 char* Platform_getProcessEnv(pid_t pid) {
    char procname[32+1];
    xSnprintf(procname, 32, "/proc/%d/environ", pid);
@@ -237,3 +264,21 @@ char* Platform_getProcessEnv(pid_t pid) {
    }
    return env;
 }
+
+void Platform_getPressureStall(const char *file, bool some, double* ten, double* sixty, double* threehundred) {
+   *ten = *sixty = *threehundred = 0;
+   char procname[128+1];
+   xSnprintf(procname, 128, PROCDIR "/pressure/%s", file);
+   FILE *fd = fopen(procname, "r");
+   if (!fd) {
+      *ten = *sixty = *threehundred = NAN;
+      return;
+   }
+   int total = fscanf(fd, "some avg10=%32lf avg60=%32lf avg300=%32lf total=%*f ", ten, sixty, threehundred);
+   if (!some) {
+      total = fscanf(fd, "full avg10=%32lf avg60=%32lf avg300=%32lf total=%*f ", ten, sixty, threehundred);
+   }
+   (void) total;
+   assert(total == 3);
+   fclose(fd);
+}

linux/Platform.h

@@ -27,22 +27,27 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-void Platform_setBindings(Htop_Action* keys);
+extern void Platform_setBindings(Htop_Action* keys);
 
 extern MeterClass* Platform_meterTypes[];
 
-int Platform_getUptime();
+extern int Platform_getUptime();
 
-void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+extern void Platform_getLoadAverage(double* one, double* five, double* fifteen);
 
-int Platform_getMaxPid();
+extern int Platform_getMaxPid();
 
-double Platform_setCPUValues(Meter* this, int cpu);
+extern double Platform_setCPUValues(Meter* this, int cpu);
 
-void Platform_setMemoryValues(Meter* this);
+extern void Platform_setMemoryValues(Meter* this);
 
-void Platform_setSwapValues(Meter* this);
+extern void Platform_setSwapValues(Meter* this);
 
-char* Platform_getProcessEnv(pid_t pid);
+extern void Platform_setZfsArcValues(Meter* this);
+
+extern void Platform_setZfsCompressedArcValues(Meter* this);
+extern char* Platform_getProcessEnv(pid_t pid);
+
+extern void Platform_getPressureStall(const char *file, bool some, double* ten, double* sixty, double* threehundred);
 
 #endif

linux/PressureStallMeter.c

@@ -0,0 +1,133 @@
+/*
+htop - PressureStallMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2019 Ran Benita
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "PressureStallMeter.h"
+#include "Platform.h"
+#include "CRT.h"
+
+#include <string.h>
+
+/*{
+#include "Meter.h"
+}*/
+
+static int PressureStallMeter_attributes[] = {
+   PRESSURE_STALL_TEN, PRESSURE_STALL_SIXTY, PRESSURE_STALL_THREEHUNDRED
+};
+
+static void PressureStallMeter_updateValues(Meter* this, char* buffer, int len) {
+    const char *file;
+    if (strstr(Meter_name(this), "CPU")) {
+       file = "cpu";
+    } else if (strstr(Meter_name(this), "IO")) {
+       file = "io";
+    } else {
+       file = "memory";
+    }
+
+    bool some;
+    if (strstr(Meter_name(this), "Some")) {
+       some = true;
+    } else {
+       some = false;
+    }
+
+    Platform_getPressureStall(file, some, &this->values[0], &this->values[1], &this->values[2]);
+    xSnprintf(buffer, len, "xxxx %.2lf%% %.2lf%% %.2lf%%", this->values[0], this->values[1], this->values[2]);
+}
+
+static void PressureStallMeter_display(Object* cast, RichString* out) {
+   Meter* this = (Meter*)cast;
+   char buffer[20];
+   xSnprintf(buffer, sizeof(buffer), "%.2lf%% ", this->values[0]);
+   RichString_write(out, CRT_colors[PRESSURE_STALL_TEN], buffer);
+   xSnprintf(buffer, sizeof(buffer), "%.2lf%% ", this->values[1]);
+   RichString_append(out, CRT_colors[PRESSURE_STALL_SIXTY], buffer);
+   xSnprintf(buffer, sizeof(buffer), "%.2lf%% ", this->values[2]);
+   RichString_append(out, CRT_colors[PRESSURE_STALL_THREEHUNDRED], buffer);
+}
+
+MeterClass PressureStallCPUSomeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallCPUSome",
+   .uiName = "Pressure Stall Information, some CPU",
+   .caption = "Some CPU pressure: "
+};
+
+MeterClass PressureStallIOSomeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallIOSome",
+   .uiName = "Pressure Stall Information, some IO",
+   .caption = "Some IO  pressure: "
+};
+
+MeterClass PressureStallIOFullMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallIOFull",
+   .uiName = "Pressure Stall Information, full IO",
+   .caption = "Full IO  pressure: "
+};
+
+MeterClass PressureStallMemorySomeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallMemorySome",
+   .uiName = "Pressure Stall Information, some memory",
+   .caption = "Some Mem pressure: "
+};
+
+MeterClass PressureStallMemoryFullMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallMemoryFull",
+   .uiName = "Pressure Stall Information, full memory",
+   .caption = "Full Mem pressure: "
+};

linux/PressureStallMeter.h

@@ -0,0 +1,25 @@
+/* Do not edit this file. It was automatically generated. */
+
+#ifndef HEADER_PressureStallMeter
+#define HEADER_PressureStallMeter
+/*
+htop - PressureStallMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2019 Ran Benita
+Released under the GNU GPL, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+extern MeterClass PressureStallCPUSomeMeter_class;
+
+extern MeterClass PressureStallIOSomeMeter_class;
+
+extern MeterClass PressureStallIOFullMeter_class;
+
+extern MeterClass PressureStallMemorySomeMeter_class;
+
+extern MeterClass PressureStallMemoryFullMeter_class;
+
+#endif

openbsd/Battery.c

@@ -7,10 +7,66 @@ in the source distribution for its full text.
 */
 
 #include "BatteryMeter.h"
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
+#include <errno.h>
+#include <string.h>
 
-void Battery_getData(double* level, ACPresence* isOnAC) {
+static bool findDevice(const char* name, int* mib, struct sensordev* snsrdev, size_t* sdlen) {
-   // TODO
+   for (int devn = 0;; devn++) {
-   *level = -1;
+      mib[2] = devn;
-   *isOnAC = AC_ERROR;
+      if (sysctl(mib, 3, snsrdev, sdlen, NULL, 0) == -1) {
+         if (errno == ENXIO)
+            continue;
+         if (errno == ENOENT)
+            return false;
+      }
+      if (strcmp(name, snsrdev->xname) == 0) {
+         return true;
+      }
+   }
 }
 
+void Battery_getData(double* level, ACPresence* isOnAC) {
+   static int mib[] = {CTL_HW, HW_SENSORS, 0, 0, 0};
+   struct sensor s;
+   size_t slen = sizeof(struct sensor);
+   struct sensordev snsrdev;
+   size_t sdlen = sizeof(struct sensordev);
+
+   bool found = findDevice("acpibat0", mib, &snsrdev, &sdlen);
+
+   *level = -1;
+   if (found) {
+      /* last full capacity */
+      mib[3] = 7;
+      mib[4] = 0;
+      double last_full_capacity = 0;
+      if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) {
+         last_full_capacity = s.value;
+      }
+      if (last_full_capacity > 0) {
+         /*  remaining capacity */
+         mib[3] = 7;
+         mib[4] = 3;
+         if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) {
+            double charge = s.value;
+            *level = 100*(charge / last_full_capacity);
+            if (charge >= last_full_capacity) {
+               *level = 100;
+            }
+         }
+      }
+   }
+
+   found = findDevice("acpiac0", mib, &snsrdev, &sdlen);
+
+   *isOnAC = AC_ERROR;
+   if (found) {
+      mib[3] = 9;
+      mib[4] = 0;
+      if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) {
+         *isOnAC = s.value;
+      }
+   }
+}

openbsd/Battery.h

@@ -12,5 +12,4 @@ in the source distribution for its full text.
 
 void Battery_getData(double* level, ACPresence* isOnAC);
 
-
 #endif

openbsd/OpenBSDProcess.c

@@ -135,7 +135,7 @@ ProcessFieldData Process_fields[] = {
       .flags = 0, },
    [ST_UID] = {
       .name = "ST_UID",
-      .title = " UID ",
+      .title = "  UID ",
       .description = "User ID of the process owner",
       .flags = 0, },
    [PERCENT_CPU] = {

openbsd/OpenBSDProcessList.c

@@ -6,6 +6,7 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "CRT.h"
 #include "ProcessList.h"
 #include "OpenBSDProcessList.h"
 #include "OpenBSDProcess.h"
@@ -17,6 +18,7 @@ in the source distribution for its full text.
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/resource.h>
+#include <sys/sched.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #include <sys/user.h>
@@ -31,7 +33,22 @@ in the source distribution for its full text.
 
 typedef struct CPUData_ {
    unsigned long long int totalTime;
+   unsigned long long int userTime;
+   unsigned long long int niceTime;
+   unsigned long long int sysTime;
+   unsigned long long int sysAllTime;
+   unsigned long long int spinTime;
+   unsigned long long int intrTime;
+   unsigned long long int idleTime;
+
    unsigned long long int totalPeriod;
+   unsigned long long int userPeriod;
+   unsigned long long int nicePeriod;
+   unsigned long long int sysPeriod;
+   unsigned long long int sysAllPeriod;
+   unsigned long long int spinPeriod;
+   unsigned long long int intrPeriod;
+   unsigned long long int idlePeriod;
 } CPUData;
 
 typedef struct OpenBSDProcessList_ {
@@ -79,16 +96,17 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
    if (e == -1 || pl->cpuCount < 1) {
       pl->cpuCount = 1;
    }
-   opl->cpus = xRealloc(opl->cpus, pl->cpuCount * sizeof(CPUData));
+   opl->cpus = xCalloc(pl->cpuCount + 1, sizeof(CPUData));
 
    size = sizeof(fscale);
    if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0) {
       err(1, "fscale sysctl call failed");
    }
 
-   for (i = 0; i < pl->cpuCount; i++) {
+   for (i = 0; i <= pl->cpuCount; i++) {
-      opl->cpus[i].totalTime = 1;
+      CPUData *d = opl->cpus + i;
-      opl->cpus[i].totalPeriod = 1;
+      d->totalTime = 1;
+      d->totalPeriod = 1;
    }
 
    opl->kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
@@ -205,7 +223,7 @@ char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, in
 /*
  * Taken from OpenBSD's ps(1).
  */
-double getpcpu(const struct kinfo_proc *kp) {
+static double getpcpu(const struct kinfo_proc *kp) {
    if (fscale == 0)
       return (0.0);
 
@@ -214,29 +232,30 @@ double getpcpu(const struct kinfo_proc *kp) {
    return (100.0 * fxtofl(kp->p_pctcpu));
 }
 
-void ProcessList_goThroughEntries(ProcessList* this) {
+static inline void OpenBSDProcessList_scanProcs(OpenBSDProcessList* this) {
-   OpenBSDProcessList* opl = (OpenBSDProcessList*) this;
+   Settings* settings = this->super.settings;
-   Settings* settings = this->settings;
    bool hideKernelThreads = settings->hideKernelThreads;
    bool hideUserlandThreads = settings->hideUserlandThreads;
    struct kinfo_proc* kproc;
    bool preExisting;
    Process* proc;
    OpenBSDProcess* fp;
+   struct tm date;
+   struct timeval tv;
    int count = 0;
    int i;
 
-   OpenBSDProcessList_scanMemoryInfo(this);
-
    // use KERN_PROC_KTHREAD to also include kernel threads
-   struct kinfo_proc* kprocs = kvm_getprocs(opl->kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &count);
+   struct kinfo_proc* kprocs = kvm_getprocs(this->kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &count);
    //struct kinfo_proc* kprocs = getprocs(KERN_PROC_ALL, 0, &count);
 
+   gettimeofday(&tv, NULL);
+
    for (i = 0; i < count; i++) {
       kproc = &kprocs[i];
 
       preExisting = false;
-      proc = ProcessList_getProcess(this, kproc->p_pid, &preExisting, (Process_New) OpenBSDProcess_new);
+      proc = ProcessList_getProcess(&this->super, kproc->p_pid, &preExisting, (Process_New) OpenBSDProcess_new);
       fp = (OpenBSDProcess*) proc;
 
       proc->show = ! ((hideKernelThreads && Process_isKernelThread(proc))
@@ -251,20 +270,22 @@ void ProcessList_goThroughEntries(ProcessList* this) {
          proc->pgrp = kproc->p__pgid;
          proc->st_uid = kproc->p_uid;
          proc->starttime_ctime = kproc->p_ustart_sec;
-         proc->user = UsersTable_getRef(this->usersTable, proc->st_uid);
+         proc->user = UsersTable_getRef(this->super.usersTable, proc->st_uid);
-         ProcessList_add((ProcessList*)this, proc);
+         ProcessList_add(&this->super, proc);
-         proc->comm = OpenBSDProcessList_readProcessName(opl->kd, kproc, &proc->basenameOffset);
+         proc->comm = OpenBSDProcessList_readProcessName(this->kd, kproc, &proc->basenameOffset);
+         (void) localtime_r((time_t*) &kproc->p_ustart_sec, &date);
+         strftime(proc->starttime_show, 7, ((proc->starttime_ctime > tv.tv_sec - 86400) ? "%R " : "%b%d "), &date);
       } else {
          if (settings->updateProcessNames) {
             free(proc->comm);
-            proc->comm = OpenBSDProcessList_readProcessName(opl->kd, kproc, &proc->basenameOffset);
+            proc->comm = OpenBSDProcessList_readProcessName(this->kd, kproc, &proc->basenameOffset);
          }
       }
 
       proc->m_size = kproc->p_vm_dsize;
       proc->m_resident = kproc->p_vm_rssize;
-      proc->percent_mem = (proc->m_resident * PAGE_SIZE_KB) / (double)(this->totalMem) * 100.0;
+      proc->percent_mem = (proc->m_resident * PAGE_SIZE_KB) / (double)(this->super.totalMem) * 100.0;
-      proc->percent_cpu = CLAMP(getpcpu(kproc), 0.0, this->cpuCount*100.0);
+      proc->percent_cpu = CLAMP(getpcpu(kproc), 0.0, this->super.cpuCount*100.0);
       //proc->nlwp = kproc->p_numthreads;
       //proc->time = kproc->p_rtime_sec + ((kproc->p_rtime_usec + 500000) / 10);
       proc->nice = kproc->p_nice - 20;
@@ -284,14 +305,99 @@ void ProcessList_goThroughEntries(ProcessList* this) {
       }
 
       if (Process_isKernelThread(proc)) {
-         this->kernelThreads++;
+         this->super.kernelThreads++;
       }
 
-      this->totalTasks++;
+      this->super.totalTasks++;
       // SRUN ('R') means runnable, not running
       if (proc->state == 'P') {
-         this->runningTasks++;
+         this->super.runningTasks++;
       }
       proc->updated = true;
    }
 }
+
+static unsigned long long saturatingSub(unsigned long long a, unsigned long long b) {
+   return a > b ? a - b : 0;
+}
+
+static void getKernelCPUTimes(int cpuId, u_int64_t* times) {
+   int mib[] = { CTL_KERN, KERN_CPTIME2, cpuId };
+   size_t length = sizeof(u_int64_t) * CPUSTATES;
+   if (sysctl(mib, 3, times, &length, NULL, 0) == -1 ||
+         length != sizeof(u_int64_t) * CPUSTATES) {
+      CRT_fatalError("sysctl kern.cp_time2 failed");
+   }
+}
+
+static void kernelCPUTimesToHtop(const u_int64_t* times, CPUData* cpu) {
+   unsigned long long totalTime = 0;
+   for (int i = 0; i < CPUSTATES; i++) {
+      totalTime += times[i];
+   }
+
+   unsigned long long sysAllTime = times[CP_INTR] + times[CP_SYS];
+
+   // XXX Not sure if CP_SPIN should be added to sysAllTime.
+   // See https://github.com/openbsd/src/commit/531d8034253fb82282f0f353c086e9ad827e031c
+   #ifdef CP_SPIN
+   sysAllTime += times[CP_SPIN];
+   #endif
+
+   cpu->totalPeriod = saturatingSub(totalTime, cpu->totalTime);
+   cpu->userPeriod = saturatingSub(times[CP_USER], cpu->userTime);
+   cpu->nicePeriod = saturatingSub(times[CP_NICE], cpu->niceTime);
+   cpu->sysPeriod = saturatingSub(times[CP_SYS], cpu->sysTime);
+   cpu->sysAllPeriod = saturatingSub(sysAllTime, cpu->sysAllTime);
+   #ifdef CP_SPIN
+   cpu->spinPeriod = saturatingSub(times[CP_SPIN], cpu->spinTime);
+   #endif
+   cpu->intrPeriod = saturatingSub(times[CP_INTR], cpu->intrTime);
+   cpu->idlePeriod = saturatingSub(times[CP_IDLE], cpu->idleTime);
+
+   cpu->totalTime = totalTime;
+   cpu->userTime = times[CP_USER];
+   cpu->niceTime = times[CP_NICE];
+   cpu->sysTime = times[CP_SYS];
+   cpu->sysAllTime = sysAllTime;
+   #ifdef CP_SPIN
+   cpu->spinTime = times[CP_SPIN];
+   #endif
+   cpu->intrTime = times[CP_INTR];
+   cpu->idleTime = times[CP_IDLE];
+}
+
+static void OpenBSDProcessList_scanCPUTime(OpenBSDProcessList* this) {
+   u_int64_t kernelTimes[CPUSTATES] = {0};
+   u_int64_t avg[CPUSTATES] = {0};
+
+   for (int i = 0; i < this->super.cpuCount; i++) {
+      getKernelCPUTimes(i, kernelTimes);
+      CPUData* cpu = this->cpus + i + 1;
+      kernelCPUTimesToHtop(kernelTimes, cpu);
+
+      avg[CP_USER] += cpu->userTime;
+      avg[CP_NICE] += cpu->niceTime;
+      avg[CP_SYS] += cpu->sysTime;
+      #ifdef CP_SPIN
+      avg[CP_SPIN] += cpu->spinTime;
+      #endif
+      avg[CP_INTR] += cpu->intrTime;
+      avg[CP_IDLE] += cpu->idleTime;
+   }
+
+   for (int i = 0; i < CPUSTATES; i++) {
+      avg[i] /= this->super.cpuCount;
+   }
+
+   kernelCPUTimesToHtop(avg, this->cpus);
+}
+
+void ProcessList_goThroughEntries(ProcessList* this) {
+   OpenBSDProcessList* opl = (OpenBSDProcessList*) this;
+
+   OpenBSDProcessList_scanMemoryInfo(this);
+   OpenBSDProcessList_scanProcs(opl);
+   OpenBSDProcessList_scanCPUTime(opl);
+}
+

openbsd/OpenBSDProcessList.h

@@ -15,7 +15,22 @@ in the source distribution for its full text.
 
 typedef struct CPUData_ {
    unsigned long long int totalTime;
+   unsigned long long int userTime;
+   unsigned long long int niceTime;
+   unsigned long long int sysTime;
+   unsigned long long int sysAllTime;
+   unsigned long long int spinTime;
+   unsigned long long int intrTime;
+   unsigned long long int idleTime;
+
    unsigned long long int totalPeriod;
+   unsigned long long int userPeriod;
+   unsigned long long int nicePeriod;
+   unsigned long long int sysPeriod;
+   unsigned long long int sysAllPeriod;
+   unsigned long long int spinPeriod;
+   unsigned long long int intrPeriod;
+   unsigned long long int idlePeriod;
 } CPUData;
 
 typedef struct OpenBSDProcessList_ {
@@ -51,8 +66,7 @@ char *OpenBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, in
 /*
  * Taken from OpenBSD's ps(1).
  */
-double getpcpu(const struct kinfo_proc *kp);
-
 void ProcessList_goThroughEntries(ProcessList* this);
 
+
 #endif

openbsd/Platform.c

@@ -20,9 +20,8 @@ in the source distribution for its full text.
 #include "OpenBSDProcess.h"
 #include "OpenBSDProcessList.h"
 
-#include <sys/sched.h>
-#include <uvm/uvmexp.h>
 #include <sys/param.h>
+#include <sys/sysctl.h>
 #include <sys/swap.h>
 
 #include <unistd.h>
@@ -30,10 +29,13 @@ in the source distribution for its full text.
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <time.h>
+#include <fcntl.h>
+#include <kvm.h>
+#include <limits.h>
+#include <math.h>
 
 /*{
 #include "Action.h"
@@ -44,54 +46,6 @@ extern ProcessFieldData Process_fields[];
 
 }*/
 
-#define MAXCPU 256
-// XXX: probably should be a struct member
-static int64_t old_v[MAXCPU][5];
-
-/*
- * Copyright (c) 1984, 1989, William LeFebvre, Rice University
- * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
- *
- * Taken directly from OpenBSD's top(1).
- *
- * percentages(cnt, out, new, old, diffs) - calculate percentage change
- * between array "old" and "new", putting the percentages in "out".
- * "cnt" is size of each array and "diffs" is used for scratch space.
- * The array "old" is updated on each call.
- * The routine assumes modulo arithmetic.  This function is especially
- * useful on BSD machines for calculating cpu state percentages.
- */
-static int percentages(int cnt, int64_t *out, int64_t *new, int64_t *old, int64_t *diffs) {
-   int64_t change, total_change, *dp, half_total;
-   int i;
-
-   /* initialization */
-   total_change = 0;
-   dp = diffs;
-
-   /* calculate changes for each state and the overall change */
-   for (i = 0; i < cnt; i++) {
-      if ((change = *new - *old) < 0) {
-         /* this only happens when the counter wraps */
-         change = INT64_MAX - *old + *new;
-      }
-      total_change += (*dp++ = change);
-      *old++ = *new++;
-   }
-
-   /* avoid divide by zero potential */
-   if (total_change == 0)
-      total_change = 1;
-
-   /* calculate percentages based on overall change, rounding up */
-   half_total = total_change / 2l;
-   for (i = 0; i < cnt; i++)
-      *out++ = ((*diffs++ * 1000 + half_total) / total_change);
-
-   /* return the total in case the caller wants to use it */
-   return (total_change);
-}
-
 ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
 int Platform_numberOfFields = LAST_PROCESSFIELD;
@@ -197,43 +151,38 @@ void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
 
 int Platform_getMaxPid() {
    // this is hard-coded in sys/sys/proc.h - no sysctl exists
-   return 32766;
+   return 99999;
 }
 
 double Platform_setCPUValues(Meter* this, int cpu) {
-   int i;
+   const OpenBSDProcessList* pl = (OpenBSDProcessList*) this->pl;
-   double perc;
+   const CPUData* cpuData = &(pl->cpus[cpu]);
-
+   double total = cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod;
-   OpenBSDProcessList* pl = (OpenBSDProcessList*) this->pl;
+   double totalPercent;
-   CPUData* cpuData = &(pl->cpus[cpu]);
-   int64_t new_v[CPUSTATES], diff_v[CPUSTATES], scratch_v[CPUSTATES];
    double *v = this->values;
-   size_t size = sizeof(double) * CPUSTATES;
-   int mib[] = { CTL_KERN, KERN_CPTIME2, cpu-1 };
-   if (sysctl(mib, 3, new_v, &size, NULL, 0) == -1) {
-      return 0.;
-   }
 
-   // XXX: why?
+   v[CPU_METER_NICE] = cpuData->nicePeriod / total * 100.0;
-   cpuData->totalPeriod = 1;
+   v[CPU_METER_NORMAL] = cpuData->userPeriod / total * 100.0;
-
+   if (this->pl->settings->detailedCPUTime) {
-   percentages(CPUSTATES, diff_v, new_v,
+      v[CPU_METER_KERNEL]  = cpuData->sysPeriod / total * 100.0;
-         (int64_t *)old_v[cpu-1], scratch_v);
+      v[CPU_METER_IRQ]     = cpuData->intrPeriod / total * 100.0;
-
+      v[CPU_METER_SOFTIRQ] = 0.0;
-   for (i = 0; i < CPUSTATES; i++) {
+      v[CPU_METER_STEAL]   = 0.0;
-      old_v[cpu-1][i] = new_v[i];
+      v[CPU_METER_GUEST]   = 0.0;
-      v[i] = diff_v[i] / 10.;
+      v[CPU_METER_IOWAIT]  = 0.0;
-   }
+      v[CPU_METER_FREQUENCY] = -1;
-
+      Meter_setItems(this, 8);
-   Meter_setItems(this, 4);
+      totalPercent = v[0]+v[1]+v[2]+v[3];
-
-   perc = v[0] + v[1] + v[2] + v[3];
-
-   if (perc <= 100. && perc >= 0.) {
-      return perc;
    } else {
-      return 0.;
+      v[2] = cpuData->sysAllPeriod / total * 100.0;
+      v[3] = 0.0; // No steal nor guest on OpenBSD
+      totalPercent = v[0]+v[1]+v[2];
+      Meter_setItems(this, 4);
    }
+
+   totalPercent = CLAMP(totalPercent, 0.0, 100.0);
+   if (isnan(totalPercent)) totalPercent = 0.0;
+   return totalPercent;
 }
 
 void Platform_setMemoryValues(Meter* this) {
@@ -294,6 +243,48 @@ void Platform_setTasksValues(Meter* this) {
 }
 
 char* Platform_getProcessEnv(pid_t pid) {
-   // TODO
+   char errbuf[_POSIX2_LINE_MAX];
-   return NULL;
+   char *env;
+   char **ptr;
+   int count;
+   kvm_t *kt;
+   struct kinfo_proc *kproc;
+   size_t capacity = 4096, size = 0;
+
+   if ((kt = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL)
+      return NULL;
+
+   if ((kproc = kvm_getprocs(kt, KERN_PROC_PID, pid,
+                             sizeof(struct kinfo_proc), &count)) == NULL) {\
+      (void) kvm_close(kt);
+      return NULL;
+   }
+
+   if ((ptr = kvm_getenvv(kt, kproc, 0)) == NULL) {
+      (void) kvm_close(kt);
+      return NULL;
+   }
+
+   env = xMalloc(capacity);
+   for (char **p = ptr; *p; p++) {
+      size_t len = strlen(*p) + 1;
+
+      if (size + len > capacity) {
+         capacity *= 2;
+         env = xRealloc(env, capacity);
+      }
+
+      strlcpy(env + size, *p, len);
+      size += len;
+   }
+
+   if (size < 2 || env[size - 1] || env[size - 2]) {
+       if (size + 2 < capacity)
+           env = xRealloc(env, capacity + 2);
+       env[size] = 0;
+       env[size+1] = 0;
+   }
+
+   (void) kvm_close(kt);
+   return env;
 }