Bump version, changelog for minor htop-3.0.1 release

Fix image logo and titles.

.github/workflows/ci.yml

@@ -1,29 +1,63 @@
 name: CI
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [ push, pull_request ]
 
 jobs:
   build-ubuntu-latest:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - name: Install Dependencies
+      run: sudo apt-get install libncursesw5-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror
     - name: Build
-      run: |
-        sudo apt-get install libncursesw5-dev
-        ./autogen.sh
-        ./configure
-        make
+      run: make
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS=--enable-werror
 
-#  build-macos-latest:
-#    runs-on: macos-latest
-#    steps:
-#    - uses: actions/checkout@v2
-#    - name: make
-#      run: |
-#        ./autogen.sh
-#        ./configure
-#        make
+  build-ubuntu-clang-latest:
+    runs-on: ubuntu-latest
+    env:
+      CC: clang-10
+    steps:
+    - uses: actions/checkout@v2
+    - name: install clang repo
+      run: |
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
+        sudo add-apt-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main' -y
+        sudo apt-get update -q
+    - name: Install Dependencies
+      run: sudo apt-get install clang-10 libncursesw5-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror
+    - name: Build
+      run: make
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS=--enable-werror
+
+  build-ubuntu-latest-full-featured:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Dependencies
+      run: sudo apt-get install libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror --enable-openvz --enable-cgroup --enable-vserver --enable-ancient-vserver --enable-taskstats --enable-unicode --enable-linux-affinity --enable-hwloc --enable-setuid --enable-delayacct
+    - name: Build
+      run: make
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS='--enable-werror --enable-openvz --enable-cgroup --enable-vserver --enable-ancient-vserver --enable-taskstats --enable-unicode --enable-linux-affinity --enable-hwloc --enable-setuid --enable-delayacct'
+
+  whitespace_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: check-whitespaces
+        run: git diff-tree --check $(git hash-object -t tree /dev/null) HEAD

.gitignore

@@ -39,4 +39,5 @@ libtool
 ltmain.sh
 m4/
 missing
+scripts/MakeHeader.py
 stamp-h1

Action.c

@@ -316,17 +316,19 @@ static Htop_Reaction actionSetAffinity(State* st) {
 
    Process* p = (Process*) Panel_getSelected(panel);
    if (!p) return HTOP_OK;
-   Affinity* affinity = Affinity_get(p, st->pl);
-   if (!affinity) return HTOP_OK;
-   Panel* affinityPanel = AffinityPanel_new(st->pl, affinity);
-   Affinity_delete(affinity);
+   Affinity* affinity1 = Affinity_get(p, st->pl);
+   if (!affinity1) return HTOP_OK;
+   int width;
+   Panel* affinityPanel = AffinityPanel_new(st->pl, affinity1, &width);
+   width += 1; /* we add a gap between the panels */
+   Affinity_delete(affinity1);
 
-   void* set = Action_pickFromVector(st, affinityPanel, 15, true);
+   void* set = Action_pickFromVector(st, affinityPanel, width, true);
    if (set) {
-      Affinity* affinity = AffinityPanel_getAffinity(affinityPanel, st->pl);
-      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) Affinity_set, (Arg){ .v = affinity }, NULL);
+      Affinity* affinity2 = AffinityPanel_getAffinity(affinityPanel, st->pl);
+      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) Affinity_set, (Arg){ .v = affinity2 }, NULL);
       if (!ok) beep();
-      Affinity_delete(affinity);
+      Affinity_delete(affinity2);
    }
    Panel_delete((Object*)affinityPanel);
 #endif
@@ -615,4 +617,3 @@ void Action_setBindings(Htop_Action* keys) {
    keys['c'] = actionTagAllChildren;
    keys['e'] = actionShowEnvScreen;
 }
-

Action.h

@@ -54,5 +54,4 @@ extern Htop_Reaction Action_follow(State* st);
 
 extern void Action_setBindings(Htop_Action* keys);
 
-
 #endif

AffinityPanel.c

@@ -8,69 +8,418 @@ in the source distribution for its full text.
 #include "AffinityPanel.h"
 #include "CRT.h"
 
-#include "CheckItem.h"
+#include "Vector.h"
 
 #include <assert.h>
 #include <string.h>
 
+#ifdef HAVE_LIBHWLOC
+#include <hwloc.h>
+#endif
+
 /*{
 #include "Panel.h"
 #include "Affinity.h"
 #include "ProcessList.h"
-#include "ListItem.h"
+
 }*/
 
-static HandlerResult AffinityPanel_eventHandler(Panel* this, int ch) {
-   CheckItem* selected = (CheckItem*) Panel_getSelected(this);
+typedef struct MaskItem_ {
+   Object super;
+   const char* text;
+   const char* indent; /* used also as an condition whether this is a tree node */
+   int value; /* tri-state: 0 - off, 1 - some set, 2 - all set */
+   int sub_tree; /* tri-state: 0 - no sub-tree, 1 - open sub-tree, 2 - closed sub-tree */
+   Vector *children;
+   #ifdef HAVE_LIBHWLOC
+   bool ownCpuset;
+   hwloc_bitmap_t cpuset;
+   #else
+   int cpu;
+   #endif
+} MaskItem;
+
+static void MaskItem_delete(Object* cast) {
+   MaskItem* this = (MaskItem*) cast;
+   free((void*)this->text);
+   if (this->indent)
+      free((void*)this->indent);
+   Vector_delete(this->children);
+   #ifdef HAVE_LIBHWLOC
+   if (this->ownCpuset)
+      hwloc_bitmap_free(this->cpuset);
+   #endif
+   free(this);
+}
+
+static void MaskItem_display(Object* cast, RichString* out) {
+   MaskItem* this = (MaskItem*)cast;
+   assert (this != NULL);
+   RichString_append(out, CRT_colors[CHECK_BOX], "[");
+   if (this->value == 2)
+      RichString_append(out, CRT_colors[CHECK_MARK], "x");
+   else if (this->value == 1)
+      RichString_append(out, CRT_colors[CHECK_MARK], "o");
+   else
+      RichString_append(out, CRT_colors[CHECK_MARK], " ");
+   RichString_append(out, CRT_colors[CHECK_BOX], "]");
+   RichString_append(out, CRT_colors[CHECK_TEXT], " ");
+   if (this->indent) {
+      RichString_append(out, CRT_colors[PROCESS_TREE], this->indent);
+      RichString_append(out, CRT_colors[PROCESS_TREE],
+                        this->sub_tree == 2
+                        ? CRT_treeStr[TREE_STR_OPEN]
+                        : CRT_treeStr[TREE_STR_SHUT]);
+      RichString_append(out, CRT_colors[CHECK_TEXT], " ");
+   }
+   RichString_append(out, CRT_colors[CHECK_TEXT], this->text);
+}
+
+static ObjectClass MaskItem_class = {
+   .display = MaskItem_display,
+   .delete  = MaskItem_delete
+};
+
+#ifdef HAVE_LIBHWLOC
+
+static MaskItem* MaskItem_newMask(const char* text, const char* indent, hwloc_bitmap_t cpuset, bool owner) {
+   MaskItem* this = AllocThis(MaskItem);
+   this->text = xStrdup(text);
+   this->indent = xStrdup(indent); /* nonnull for tree node */
+   this->value = 0;
+   this->ownCpuset = owner;
+   this->cpuset = cpuset;
+   this->sub_tree = hwloc_bitmap_weight(cpuset) > 1 ? 1 : 0;
+   this->children = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+   return this;
+}
+
+#endif
+
+static MaskItem* MaskItem_newSingleton(const char* text, int cpu, bool isSet) {
+   MaskItem* this = AllocThis(MaskItem);
+   this->text = xStrdup(text);
+   this->indent = NULL; /* not a tree node */
+   this->sub_tree = 0;
+   this->children = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+
+   #ifdef HAVE_LIBHWLOC
+   this->ownCpuset = true;
+   this->cpuset = hwloc_bitmap_alloc();
+   hwloc_bitmap_set(this->cpuset, cpu);
+   (void)isSet;
+   #else
+   this->cpu = cpu;
+   #endif
+   this->value = 2 * isSet;
+
+   return this;
+}
+
+typedef struct AffinityPanel_ {
+   Panel super;
+   ProcessList* pl;
+   bool topoView;
+   Vector *cpuids;
+   unsigned width;
+
+   #ifdef HAVE_LIBHWLOC
+   MaskItem *topoRoot;
+   hwloc_const_cpuset_t allCpuset;
+   hwloc_bitmap_t workCpuset;
+   #endif
+} AffinityPanel;
+
+static void AffinityPanel_delete(Object* cast) {
+   AffinityPanel* this = (AffinityPanel*) cast;
+   Panel* super = (Panel*) this;
+   Panel_done(super);
+   Vector_delete(this->cpuids);
+   #ifdef HAVE_LIBHWLOC
+   hwloc_bitmap_free(this->workCpuset);
+   MaskItem_delete((Object*) this->topoRoot);
+   #endif
+   free(this);
+}
+
+#ifdef HAVE_LIBHWLOC
+
+static void AffinityPanel_updateItem(AffinityPanel* this, MaskItem* item) {
+   Panel* super = (Panel*) this;
+
+   item->value = hwloc_bitmap_isincluded(item->cpuset, this->workCpuset) ? 2 :
+                 hwloc_bitmap_intersects(item->cpuset, this->workCpuset) ? 1 : 0;
+
+   Panel_add(super, (Object*) item);
+}
+
+static void AffinityPanel_updateTopo(AffinityPanel* this, MaskItem* item) {
+   AffinityPanel_updateItem(this, item);
+
+   if (item->sub_tree == 2)
+      return;
+
+   for (int i = 0; i < Vector_size(item->children); i++)
+      AffinityPanel_updateTopo(this, (MaskItem*) Vector_get(item->children, i));
+}
+
+#endif
+
+static void AffinityPanel_update(AffinityPanel* this, bool keepSelected) {
+   Panel* super = (Panel*) this;
+
+   FunctionBar_setLabel(super->currentBar, KEY_F(3), this->topoView ? "Collapse/Expand" : "");
+   FunctionBar_draw(super->currentBar, NULL);
+
+   int oldSelected = Panel_getSelectedIndex(super);
+   Panel_prune(super);
+
+   #ifdef HAVE_LIBHWLOC
+   if (this->topoView)
+      AffinityPanel_updateTopo(this, this->topoRoot);
+   else {
+      for (int i = 0; i < Vector_size(this->cpuids); i++)
+         AffinityPanel_updateItem(this, (MaskItem*) Vector_get(this->cpuids, i));
+   }
+   #else
+   Panel_splice(super, this->cpuids);
+   #endif
+
+   if (keepSelected)
+      Panel_setSelected(super, oldSelected);
+
+   super->needsRedraw = true;
+}
+
+static HandlerResult AffinityPanel_eventHandler(Panel* super, int ch) {
+   AffinityPanel* this = (AffinityPanel*) super;
+   HandlerResult result = IGNORED;
+   MaskItem* selected = (MaskItem*) Panel_getSelected(super);
+   bool keepSelected = true;
+
    switch(ch) {
    case KEY_MOUSE:
    case KEY_RECLICK:
    case ' ':
-      CheckItem_set(selected, ! (CheckItem_get(selected)) );
-      return HANDLED;
+      #ifdef HAVE_LIBHWLOC
+      if (selected->value == 2) {
+         /* Item was selected, so remove this mask from the top cpuset. */
+         hwloc_bitmap_andnot(this->workCpuset, this->workCpuset, selected->cpuset);
+         selected->value = 0;
+      } else {
+         /* Item was not or only partial selected, so set all bits from this object
+            in the top cpuset. */
+         hwloc_bitmap_or(this->workCpuset, this->workCpuset, selected->cpuset);
+         selected->value = 2;
+      }
+      #else
+      selected->value = 2 * !selected->value; /* toggle between 0 and 2 */
+      #endif
+
+      result = HANDLED;
+      break;
+
+   #ifdef HAVE_LIBHWLOC
+
+   case KEY_F(1):
+      hwloc_bitmap_copy(this->workCpuset, this->allCpuset);
+      result = HANDLED;
+      break;
+
+   case KEY_F(2):
+      this->topoView = !this->topoView;
+      keepSelected = false;
+
+      result = HANDLED;
+      break;
+
+   case KEY_F(3):
+   case '-':
+   case '+':
+      if (selected->sub_tree)
+         selected->sub_tree = 1 + !(selected->sub_tree - 1); /* toggle between 1 and 2 */
+
+      result = HANDLED;
+      break;
+
+   #endif
+
    case 0x0a:
    case 0x0d:
    case KEY_ENTER:
-      return BREAK_LOOP;
+      result = BREAK_LOOP;
+      break;
    }
-   return IGNORED;
+
+   if (HANDLED == result)
+      AffinityPanel_update(this, keepSelected);
+
+   return result;
 }
 
+#ifdef HAVE_LIBHWLOC
+
+static MaskItem *AffinityPanel_addObject(AffinityPanel* this, hwloc_obj_t obj, unsigned indent, MaskItem *parent) {
+   const char* type_name = hwloc_obj_type_string(obj->type);
+   const char* index_prefix = "#";
+   unsigned depth = obj->depth;
+   unsigned index = obj->logical_index;
+   size_t off = 0, left = 10 * depth;
+   char buf[64], indent_buf[left + 1];
+
+   if (obj->type == HWLOC_OBJ_PU) {
+      index = Settings_cpuId(this->pl->settings, obj->os_index);
+      type_name = "CPU";
+      index_prefix = "";
+   }
+
+   indent_buf[0] = '\0';
+   if (depth > 0) {
+      for (unsigned i = 1; i < depth; i++) {
+         xSnprintf(&indent_buf[off], left, "%s  ", (indent & (1u << i)) ? CRT_treeStr[TREE_STR_VERT] : " ");
+         size_t len = strlen(&indent_buf[off]);
+         off += len, left -= len;
+      }
+      xSnprintf(&indent_buf[off], left, "%s",
+             obj->next_sibling ? CRT_treeStr[TREE_STR_RTEE] : CRT_treeStr[TREE_STR_BEND]);
+      size_t len = strlen(&indent_buf[off]);
+      off += len, left -= len;
+   }
+
+   xSnprintf(buf, 64, "%s %s%u", type_name, index_prefix, index);
+
+   MaskItem *item = MaskItem_newMask(buf, indent_buf, obj->complete_cpuset, false);
+   if (parent)
+      Vector_add(parent->children, item);
+
+   if (item->sub_tree && parent && parent->sub_tree == 1) {
+      /* if obj is fully included or fully excluded, collapse the item */
+      hwloc_bitmap_t result = hwloc_bitmap_alloc();
+      hwloc_bitmap_and(result, obj->complete_cpuset, this->workCpuset);
+      int weight = hwloc_bitmap_weight(result);
+      hwloc_bitmap_free(result);
+      if (weight == 0 || weight == (hwloc_bitmap_weight(this->workCpuset) + hwloc_bitmap_weight(obj->complete_cpuset)))
+         item->sub_tree = 2;
+   }
+
+   /* "[x] " + "|- " * depth + ("- ")?(if root node) + name */
+   unsigned width = 4 + 3 * depth + (2 * !depth) + strlen(buf);
+   if (width > this->width)
+      this->width = width;
+
+   return item;
+}
+
+static MaskItem *AffinityPanel_buildTopology(AffinityPanel* this, hwloc_obj_t obj, unsigned indent, MaskItem *parent) {
+   MaskItem *item = AffinityPanel_addObject(this, obj, indent, parent);
+   if (obj->next_sibling) {
+      indent |= (1u << obj->depth);
+   } else {
+      indent &= ~(1u << obj->depth);
+   }
+   for (unsigned i = 0; i < obj->arity; i++)
+      AffinityPanel_buildTopology(this, obj->children[i], indent, item);
+
+   return parent == NULL ? item : NULL;
+}
+
+#endif
+
 PanelClass AffinityPanel_class = {
    .super = {
       .extends = Class(Panel),
-      .delete = Panel_delete
+      .delete = AffinityPanel_delete
    },
    .eventHandler = AffinityPanel_eventHandler
 };
 
-Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity) {
-   Panel* this = Panel_new(1, 1, 1, 1, true, Class(CheckItem), FunctionBar_newEnterEsc("Set    ", "Cancel "));
-   Object_setClass(this, Class(AffinityPanel));
+static const char* const AffinityPanelFunctions[] = {
+   "Set    ",
+   "Cancel ",
+   #ifdef HAVE_LIBHWLOC
+   "All",
+   "Topology",
+   "               ",
+   #endif
+   NULL
+};
+static const char* const AffinityPanelKeys[] = {"Enter", "Esc", "F1", "F2", "F3"};
+static const int AffinityPanelEvents[] = {13, 27, KEY_F(1), KEY_F(2), KEY_F(3)};
+
+Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity, int* width) {
+   AffinityPanel* this = AllocThis(AffinityPanel);
+   Panel* super = (Panel*) this;
+   Panel_init(super, 1, 1, 1, 1, Class(MaskItem), false, FunctionBar_new(AffinityPanelFunctions, AffinityPanelKeys, AffinityPanelEvents));
+
+   this->pl = pl;
+   /* defaults to 15, this also includes the gap between the panels,
+    * but this will be added by the caller */
+   this->width = 14;
+
+   this->cpuids   = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+
+   #ifdef HAVE_LIBHWLOC
+   this->topoView = pl->settings->topologyAffinity;
+   #else
+   this->topoView = false;
+   #endif
+
+   #ifdef HAVE_LIBHWLOC
+   this->allCpuset  = hwloc_topology_get_complete_cpuset(pl->topology);
+   this->workCpuset = hwloc_bitmap_alloc();
+   #endif
+
+   Panel_setHeader(super, "Use CPUs:");
 
-   Panel_setHeader(this, "Use CPUs:");
    int curCpu = 0;
    for (int i = 0; i < pl->cpuCount; i++) {
-      char number[10];
-      xSnprintf(number, 9, "%d", Settings_cpuId(pl->settings, i));
-      bool mode;
+      char number[16];
+      xSnprintf(number, 9, "CPU %d", Settings_cpuId(pl->settings, i));
+      unsigned width = 4 + strlen(number);
+      if (width > this->width)
+         this->width = width;
+
+      bool isSet = false;
       if (curCpu < affinity->used && affinity->cpus[curCpu] == i) {
-         mode = true;
+         #ifdef HAVE_LIBHWLOC
+         hwloc_bitmap_set(this->workCpuset, i);
+         #endif
+         isSet = true;
          curCpu++;
-      } else {
-         mode = false;
       }
-      Panel_add(this, (Object*) CheckItem_newByVal(xStrdup(number), mode));
+
+      MaskItem* cpuItem = MaskItem_newSingleton(number, i, isSet);
+      Vector_add(this->cpuids, (Object*) cpuItem);
    }
-   return this;
+
+   #ifdef HAVE_LIBHWLOC
+   this->topoRoot = AffinityPanel_buildTopology(this, hwloc_get_root_obj(pl->topology), 0, NULL);
+   #endif
+
+   if (width)
+      *width = this->width;
+
+   AffinityPanel_update(this, false);
+
+   return super;
 }
 
-Affinity* AffinityPanel_getAffinity(Panel* this, ProcessList* pl) {
+Affinity* AffinityPanel_getAffinity(Panel* super, ProcessList* pl) {
+   AffinityPanel* this = (AffinityPanel*) super;
    Affinity* affinity = Affinity_new(pl);
-   int size = Panel_size(this);
-   for (int i = 0; i < size; i++) {
-      if (CheckItem_get((CheckItem*)Panel_get(this, i)))
-         Affinity_add(affinity, i);
+
+   #ifdef HAVE_LIBHWLOC
+   int i;
+   hwloc_bitmap_foreach_begin(i, this->workCpuset)
+      Affinity_add(affinity, i);
+   hwloc_bitmap_foreach_end();
+   #else
+   for (int i = 0; i < this->pl->cpuCount; i++) {
+      MaskItem* item = (MaskItem*)Vector_get(this->cpuids, i);
+      if (item->value)
+         Affinity_add(affinity, item->cpu);
    }
+   #endif
+
    return affinity;
 }

AffinityPanel.h

@@ -9,15 +9,32 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
+#ifdef HAVE_LIBHWLOC
+#endif
+
 #include "Panel.h"
 #include "Affinity.h"
 #include "ProcessList.h"
-#include "ListItem.h"
+
+
+
+#ifdef HAVE_LIBHWLOC
+
+#endif
+
+
+#ifdef HAVE_LIBHWLOC
+
+#endif
+
+#ifdef HAVE_LIBHWLOC
+
+#endif
 
 extern PanelClass AffinityPanel_class;
 
-extern Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity);
+extern Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity, int* width);
 
-extern Affinity* AffinityPanel_getAffinity(Panel* this, ProcessList* pl);
+extern Affinity* AffinityPanel_getAffinity(Panel* super, ProcessList* pl);
 
 #endif

CONTRIBUTING.md

@@ -1,56 +1,34 @@
-
 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
+Thank you so much for taking the time to contribute in to htop!
 
 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!
+tracker](https://github.com/htop-dev/htop/issues).
+Bug reports are extremely important since it's impossible for us 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
+repo](https://github.com/htop-dev/htop) and send a [pull
+request](https://github.com/htop-dev/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!
+small footprint and perform well on systems under stress -- so unfortunately
+we can't accept every new feature proposed, as we 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 always included, 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). :-) 
-
+Please label Github issues that are feature requests with the [`feature
+request`](https://github.com/htop-dev/htop/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%22feature+request%22+)
+label.

COPYING

@@ -353,4 +353,3 @@ Public License instead of this License.
  applicable licenses of the version of PLPA used in your combined work,
  provided that you include the source code of such version of PLPA when
  and as the GNU GPL requires distribution of source code.
-

CRT.c

@@ -167,7 +167,9 @@ const char *CRT_treeStrUtf8[TREE_STR_COUNT] = {
    "\xe2\x94\x9c", // TREE_STR_RTEE ├
    "\xe2\x94\x94", // TREE_STR_BEND └
    "\xe2\x94\x8c", // TREE_STR_TEND ┌
-   "+",            // TREE_STR_OPEN +
+   "+",            // TREE_STR_OPEN +, TODO use 🮯 'BOX DRAWINGS LIGHT HORIZONTAL
+                   // WITH VERTICAL STROKE' (U+1FBAF, "\xf0\x9f\xae\xaf") when
+                   // Unicode 13 is common
    "\xe2\x94\x80", // TREE_STR_SHUT ─
 };
 
@@ -665,7 +667,7 @@ void CRT_restorePrivileges() {
 
 // TODO: pass an instance of Settings instead.
 
-void CRT_init(int delay, int colorScheme) {
+void CRT_init(int delay, int colorScheme, bool allowUnicode) {
    initscr();
    noecho();
    CRT_delay = delay;
@@ -731,10 +733,12 @@ void CRT_init(int delay, int colorScheme) {
    setlocale(LC_CTYPE, "");
 
 #ifdef HAVE_LIBNCURSESW
-   if(strcmp(nl_langinfo(CODESET), "UTF-8") == 0)
+   if (allowUnicode && strcmp(nl_langinfo(CODESET), "UTF-8") == 0)
       CRT_utf8 = true;
    else
       CRT_utf8 = false;
+#else
+   (void) allowUnicode;
 #endif
 
    CRT_treeStr =

CRT.h

@@ -189,7 +189,7 @@ extern void CRT_restorePrivileges();
 
 // TODO: pass an instance of Settings instead.
 
-extern void CRT_init(int delay, int colorScheme);
+extern void CRT_init(int delay, int colorScheme, bool allowUnicode);
 
 extern void CRT_done();
 

ChangeLog

@@ -1,3 +1,79 @@
+What's new in version 3.0.1
+
+* Coverity fixes, CI improvements, documentation updates
+* BUGFIX: Fix early exit with longer sysfs battery paths
+* BUGFIX: Improve OOM output, fix sorting
+(thanks to Christian Göttsche)
+* Rework check buttons and tree open/closed
+(thanks to Bert Wesarg)
+* Add -U/--no-unicode option to disable unicode
+(thanks to Christian Hesse)
+* Improvements to the affinity panel
+(thanks to Bert Wesarg)
+
+What's new in version 3.0.0
+
+* New maintainers - after a prolonged period of inactivity
+  from Hisham, the creator and original maintainer, a team
+  of community maintainers have volunteered to take over a
+  fork at https://htop.dev and https://github.com/htop-dev
+  to keep the project going.
+
+* Support ZFS ARC statistics
+  (thanks to Ross Williams)
+* Support more than 2 smaller CPU meter columns
+  (thanks to Christoph Budziszewski)
+* Support Linux proportional set size metrics
+  (thanks to @linvinus, @ntninja and @himikof)
+* Support Linux pressure stall information metrics
+  (thanks to Ran Benita)
+* New display option to show CPU frequency in CPU meters
+  (thanks to Arnav Singh)
+* Update Linux sysfs battery discovery for recent kernels
+  (thanks to @smattie)
+* Add hardware topology information in the affinity panel
+  (thanks to Bert Wesarg)
+* Add timestamp reporting to the strace screen
+  (thanks to Mario Harjac)
+* Add simple, optional vim key mapping mode
+  (thanks to Daniel Flanagan)
+* Added an option to disable the mouse
+  (thanks to MartinJM)
+* Add Solaris11 compatibility
+  (thanks to Jan Senolt)
+* Without an argument -u uses $USER value automatically
+  (thanks to @solanav)
+* Support less(1) search navigation shortcuts
+  (thanks to @syrrim)
+* Update the FreeBSD maximum PID to match FreeBSD change
+  (thanks to @multiplexd)
+* Report values larger than 100 terabytes
+  (thanks to @adrien1018)
+* Widen ST_UID (UID) column to allow for UIDs > 9999
+  (thanks to DLange)
+* BUGFIX: fix makefiles for building with clang
+  (thanks to Jorge Pereira)
+* BUGFIX: fix <sys/sysmacros.h> major() usage
+  (thanks to @wataash and Kang-Che Sung)
+* BUGFIX: fix the STARTTIME column on FreeBSD
+  (thanks to Rob Crowston)
+* BUGFIX: truncate overwide jail names on FreeBSD
+  (thanks to Rob Crowston)
+* BUGFIX: fix reported memory values on FreeBSD
+  (thanks to Tobias Kortkamp)
+* BUGFIX: fix reported CPU meter values on OpenBSD
+  (thanks to @motet-a)
+* BUGFIX: correctly identify other types of zombie process
+  (thanks to @joder)
+* BUGFIX: improve follow-process handling in some situations
+  (thanks to @wangqr)
+* BUGFIX: fix custom meters reverting to unexpected setting
+  (thanks to @wangqr)
+* BUGFIX: close pipe after running lsof(1)
+  (thanks to Jesin)
+* BUGFIX: meters honour setting of counting CPUs from 0/1
+  (thanks to @rnsanchez)
+
 What's new in version 2.2.0
 
 * Solaris/Illumos/OpenIndiana support

ColumnsPanel.c

@@ -164,4 +164,3 @@ void ColumnsPanel_update(Panel* super) {
    }
    this->settings->fields[size] = 0;
 }
-

ColumnsPanel.h

@@ -28,5 +28,4 @@ extern int ColumnsPanel_fieldNameToIndex(const char* name);
 
 extern void ColumnsPanel_update(Panel* super);
 
-
 #endif

DisplayOptionsPanel.c

@@ -100,5 +100,9 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
    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)));
+   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Enable vim mode"), &(settings->vimMode)));
+   #ifdef HAVE_LIBHWLOC
+   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Show topology when selecting affinity by default"), &(settings->topologyAffinity)));
+   #endif
    return this;
 }

Header.c

@@ -154,7 +154,7 @@ char* Header_readMeterName(Header* this, int i, int column) {
    int nameLen = strlen(Meter_name(meter));
    int len = nameLen + 100;
    char* name = xMalloc(len);
-   strncpy(name, Meter_name(meter), nameLen);
+   memcpy(name, Meter_name(meter), nameLen);
    name[nameLen] = '\0';
    if (meter->param)
       xSnprintf(name + nameLen, len - nameLen, "(%d)", meter->param);

InfoScreen.c

@@ -56,7 +56,7 @@ static const char* const InfoScreenKeys[] = {"F3", "F4", "F5", "Esc"};
 
 static int InfoScreenEvents[] = {KEY_F(3), KEY_F(4), KEY_F(5), 27};
 
-InfoScreen* InfoScreen_init(InfoScreen* this, Process* process, FunctionBar* bar, int height, char* panelHeader) {
+InfoScreen* InfoScreen_init(InfoScreen* this, Process* process, FunctionBar* bar, int height, const char* panelHeader) {
    this->process = process;
    if (!bar) {
       bar = FunctionBar_new(InfoScreenFunctions, InfoScreenKeys, InfoScreenEvents);
@@ -75,12 +75,12 @@ InfoScreen* InfoScreen_done(InfoScreen* this) {
    return this;
 }
 
-void InfoScreen_drawTitled(InfoScreen* this, char* fmt, ...) {
+void InfoScreen_drawTitled(InfoScreen* this, const char* fmt, ...) {
    va_list ap;
    va_start(ap, fmt);
    attrset(CRT_colors[METER_TEXT]);
    mvhline(0, 0, ' ', COLS);
-   wmove(stdscr, 0, 0);
+   (void) wmove(stdscr, 0, 0);
    vw_printw(stdscr, fmt, ap);
    attrset(CRT_colors[DEFAULT_COLOR]);
    this->display->needsRedraw = true;

InfoScreen.h

@@ -38,11 +38,11 @@ struct InfoScreen_ {
    Vector* lines;
 };
 
-extern 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, const char* panelHeader);
 
 extern InfoScreen* InfoScreen_done(InfoScreen* this);
 
-extern void InfoScreen_drawTitled(InfoScreen* this, char* fmt, ...);
+extern void InfoScreen_drawTitled(InfoScreen* this, const char* fmt, ...);
 
 extern void InfoScreen_addLine(InfoScreen* this, const char* line);
 

ListItem.c

@@ -85,4 +85,3 @@ long ListItem_compare(const void* cast1, const void* cast2) {
    ListItem* obj2 = (ListItem*) cast2;
    return strcmp(obj1->value, obj2->value);
 }
-

ListItem.h

@@ -29,5 +29,4 @@ extern const char* ListItem_getRef(ListItem* this);
 
 extern long ListItem_compare(const void* cast1, const void* cast2);
 
-
 #endif

Makefile.am

@@ -12,7 +12,7 @@ applications_DATA = htop.desktop
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = htop.png
 
-AM_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)"
 AM_LDFLAGS =
 AM_CPPFLAGS = -DNDEBUG
 
@@ -203,7 +203,8 @@ endif
 SUFFIXES = .h
 
 BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
-htop_SOURCES  = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
+htop_SOURCES  = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
+nodist_htop_SOURCES = config.h
 
 .PHONY: htop-headers clean-htop-headers
 
@@ -225,7 +226,7 @@ coverage:
 	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-fprofile-arcs -ftest-coverage -DDEBUG" LDFLAGS="-lgcov"
 
 .c.h:
-	@srcdir@/scripts/MakeHeader.py $<
+	./scripts/MakeHeader.py $<
 
 cppcheck:
 	cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS

NEWS

@@ -2,4 +2,3 @@
 See the commit history for news of the past.
 See the bug tracker for news of the future.
 Run the program for news of the present.
-

Panel.c

@@ -264,6 +264,14 @@ void Panel_setSelected(Panel* this, int selected) {
    }
 }
 
+void Panel_splice(Panel *this, Vector* from) {
+   assert (this != NULL);
+   assert (from != NULL);
+
+   Vector_splice(this->items, from);
+   this->needsRedraw = true;
+}
+
 void Panel_draw(Panel* this, bool focus) {
    assert (this != NULL);
 

Panel.h

@@ -119,6 +119,8 @@ extern void Panel_setSelected(Panel* this, int selected);
 
 extern void Panel_draw(Panel* this, bool focus);
 
+extern void Panel_splice(Panel *this, Vector* from);
+
 extern bool Panel_onKey(Panel* this, int key);
 
 extern HandlerResult Panel_selectByTyping(Panel* this, int ch);

Process.c

@@ -85,7 +85,7 @@ typedef enum ProcessFields {
 
 typedef struct ProcessPidColumn_ {
    int id;
-   char* label;
+   const char* label;
 } ProcessPidColumn;
 
 typedef struct Process_ {

Process.h

@@ -61,7 +61,7 @@ typedef enum ProcessFields {
 
 typedef struct ProcessPidColumn_ {
    int id;
-   char* label;
+   const char* label;
 } ProcessPidColumn;
 
 typedef struct Process_ {

ProcessList.c

@@ -93,12 +93,19 @@ ProcessList* ProcessList_init(ProcessList* this, ObjectClass* klass, UsersTable*
 
 #ifdef HAVE_LIBHWLOC
    this->topologyOk = false;
-   int topoErr = hwloc_topology_init(&this->topology);
-   if (topoErr == 0) {
-      topoErr = hwloc_topology_load(this->topology);
-   }
-   if (topoErr == 0) {
-      this->topologyOk = true;
+   if (hwloc_topology_init(&this->topology) == 0) {
+      this->topologyOk =
+         #if HWLOC_API_VERSION < 0x00020000
+         /* try to ignore the top-level machine object type */
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_MACHINE) &&
+         /* ignore caches, which don't add structure */
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_CORE) &&
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_CACHE) &&
+         0 == hwloc_topology_set_flags(this->topology, HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM) &&
+         #else
+         0 == hwloc_topology_set_all_types_filter(this->topology, HWLOC_TYPE_FILTER_KEEP_STRUCTURE) &&
+         #endif
+         0 == hwloc_topology_load(this->topology);
    }
 #endif
 

README

@@ -1,13 +1,13 @@
-![htop](https://htop.dev)
+# [![htop](htop.png)](https://htop.dev)
 
 [![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)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/21665/badge.svg)](https://scan.coverity.com/projects/21665)
 [![Mailing List](https://img.shields.io/badge/Mailing%20List-htop-blue.svg)](https://groups.io/g/htop)
 [![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)
+[![Download](https://api.bintray.com/packages/htop/source/htop/images/download.svg)](https://bintray.com/htop/source/htop/_latestVersion)
 
-Introduction
-------------
+## Introduction
 
 `htop` is a cross-platform interactive process viewer.
 It requires `ncurses`.
@@ -15,20 +15,23 @@ It requires `ncurses`.
 For more information and details on how to contribute to `htop`
 visit [htop.dev](https://htop.dev).
 
-Build instructions
-------------------
+## Build instructions
 
 This program is distributed as a standard autotools-based package.
-For detailed instructions see the [INSTALL](/INSTALL) file, which
+For detailed instructions see the `INSTALL` file, which
 is created after `./autogen.sh` is run.
 
 When compiling from a [release tarball](https://github.com/htop-dev/htop/releases/), run:
 
-    ./configure && make
+~~~ shell
+./configure && make
+~~~
 
 For compiling sources downloaded from the Git repository, run:
 
-    ./autogen.sh && ./configure && make
+~~~ shell
+./autogen.sh && ./configure && make
+~~~
 
 By default `make install` will install into `/usr/local`, for changing
 the path use `./configure --prefix=/some/path`.

Settings.c

@@ -62,6 +62,9 @@ typedef struct Settings_ {
    bool headerMargin;
    bool enableMouse;
    bool vimMode;
+   #ifdef HAVE_LIBHWLOC
+   bool topologyAffinity;
+   #endif
 
    bool changed;
 } Settings;
@@ -256,6 +259,10 @@ static bool Settings_read(Settings* this, const char* fileName) {
          didReadMeters = true;
       } else if (String_eq(option[0], "vim_mode")) {
          this->vimMode = atoi(option[1]);
+      #ifdef HAVE_LIBHWLOC
+      } else if (String_eq(option[0], "topology_affinity")) {
+         this->topologyAffinity = !!atoi(option[1]);
+      #endif
       }
       String_freeArray(option);
    }
@@ -336,6 +343,9 @@ bool Settings_write(Settings* this) {
    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);
+   #ifdef HAVE_LIBHWLOC
+   fprintf(fd, "topology_affinity=%d\n", (int) this->topologyAffinity);
+   #endif
    fclose(fd);
    return true;
 }
@@ -362,6 +372,9 @@ Settings* Settings_new(int cpuCount) {
    this->cpuCount = cpuCount;
    this->showProgramPath = true;
    this->highlightThreads = true;
+   #ifdef HAVE_LIBHWLOC
+   this->topologyAffinity = false;
+   #endif
 
    this->fields = xCalloc(Platform_numberOfFields+1, sizeof(ProcessField));
    // TODO: turn 'fields' into a Vector,

Settings.h

@@ -53,6 +53,9 @@ typedef struct Settings_ {
    bool headerMargin;
    bool enableMouse;
    bool vimMode;
+   #ifdef HAVE_LIBHWLOC
+   bool topologyAffinity;
+   #endif
 
    bool changed;
 } Settings;

StringUtils.c

@@ -81,10 +81,7 @@ char** String_split(const char* s, char sep, int* n) {
       s += size + 1;
    }
    if (s[0] != '\0') {
-      int size = strlen(s);
-      char* token = xMalloc(size + 1);
-      strncpy(token, s, size + 1);
-      out[ctr] = token;
+      out[ctr] = xStrdup(s);
       ctr++;
    }
    out = xRealloc(out, sizeof(char*) * (ctr + 1));

TESTPLAN

@@ -152,4 +152,3 @@ STrace screen:
 LSOF screen:
 
    TODO
-   

Vector.c

@@ -335,3 +335,15 @@ inline int Vector_indexOf(Vector* this, void* search_, Object_Compare compare) {
    }
    return -1;
 }
+
+void Vector_splice(Vector* this, Vector* from) {
+   assert(Vector_isConsistent(this));
+   assert(Vector_isConsistent(from));
+   assert(!(this->owner && from->owner));
+
+   int olditmes = this->items;
+   this->items += from->items;
+   Vector_checkArraySize(this);
+   for (int j = 0; j < from->items; j++)
+      this->array[olditmes + j] = from->array[j];
+}

Vector.h

@@ -88,4 +88,6 @@ extern void Vector_add(Vector* this, void* data_);
 
 extern int Vector_indexOf(Vector* this, void* search_, Object_Compare compare);
 
+void Vector_splice(Vector* this, Vector* from);
+
 #endif

XAlloc.c

@@ -14,7 +14,7 @@
 #include <stdlib.h>
 }*/
 
-static inline void fail() {
+void fail() {
    curs_set(1);
    endwin();
    err(1, NULL);
@@ -44,6 +44,10 @@ void* xRealloc(void* ptr, size_t size) {
    return data;
 }
 
+#undef xAsprintf
+
+#define xAsprintf(strp, fmt, ...) do { int _r=asprintf(strp, fmt, __VA_ARGS__); if (_r < 0) { fail(); } } while(0)
+
 #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)
 
 #undef xStrdup

XAlloc.h

@@ -11,12 +11,18 @@
 #include <assert.h>
 #include <stdlib.h>
 
+extern void fail(void);
+
 extern void* xMalloc(size_t size);
 
 extern void* xCalloc(size_t nmemb, size_t size);
 
 extern void* xRealloc(void* ptr, size_t size);
 
+#undef xAsprintf
+
+#define xAsprintf(strp, fmt, ...) do { int _r=asprintf(strp, fmt, __VA_ARGS__); if (_r < 0) { fail(); } } while(0)
+
 #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)
 
 #undef xStrdup

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.65)
-AC_INIT([htop],[3.0.0],[htop@groups.io])
+AC_INIT([htop],[3.0.1],[htop@groups.io])
 
 AC_CONFIG_SRCDIR([htop.c])
 AC_CONFIG_AUX_DIR([.])
@@ -111,20 +111,12 @@ AC_SUBST(wextra_flag)
 # ----------------------------------------------------------------------
 PROCDIR=/proc
 
-AC_ARG_ENABLE(proc, [AS_HELP_STRING([--enable-proc], [use Linux-compatible proc filesystem])], enable_proc="yes", enable_proc="no")
-if test "x$enable_proc" = xyes; then
-   # An enabled proc assumes we're emulating Linux.
-   my_htop_platform=linux
-   AC_DEFINE(HAVE_PROC, 1, [Define if using a Linux-compatible proc filesystem.])
-fi
-
 AC_ARG_WITH(proc, [AS_HELP_STRING([--with-proc=DIR], [Location of a Linux-compatible proc filesystem (default=/proc).])],
-
-if test -n "$withval"; then
-   AC_DEFINE_UNQUOTED(PROCDIR, "$withval", [Path of proc filesystem])
-   PROCDIR="$withval"
-fi,
-AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem]))
+  if test -n "$withval"; then
+    AC_DEFINE_UNQUOTED(PROCDIR, "$withval", [Path of proc filesystem])
+    PROCDIR="$withval"
+  fi,
+  AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem]))
 
 if test "x$cross_compiling" = xno; then
    if test "x$enable_proc" = xyes; then
@@ -295,6 +287,12 @@ then
    ])
 fi
 
+AC_ARG_ENABLE([werror], [AS_HELP_STRING([--enable-werror], [Treat warnings as errors (default: warnings are not errors)])], [enable_werror="$enableval"], [enable_werror=no])
+AS_IF([test "x$enable_werror" = "xyes"], [AM_CFLAGS="$AM_CFLAGS -Werror"])
+AC_SUBST([AM_CFLAGS])
+
+AC_CHECK_PROGS(PYTHON, [python python3 python2])
+AC_SUBST(PYTHON)
 
 # Bail out on errors.
 # ----------------------------------------------------------------------
@@ -318,6 +316,7 @@ 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])
+AC_CONFIG_FILES([scripts/MakeHeader.py], [chmod +x scripts/MakeHeader.py])
 AC_OUTPUT
 
 if test "$my_htop_platform" = "unsupported"
@@ -333,3 +332,20 @@ then
    echo "****************************************************************"
    echo ""
 fi
+
+AC_MSG_RESULT([
+  ${PACKAGE_NAME} ${VERSION}
+
+  platform:                $my_htop_platform
+  proc directory:          $PROCDIR
+  openvz:                  $enable_openvz
+  cgroup:                  $enable_cgroup
+  vserver:                 $enable_vserver
+  ancient vserver:         $enable_ancient_vserver
+  taskstats:               $enable_taskstats
+  unicode:                 $enable_unicode
+  linux affinity:          $enable_linux_affinity
+  hwlock:                  $enable_hwloc
+  setuid:                  $enable_setuid
+  linux delay accounting:  $enable_delayacct
+])

darwin/Battery.c

@@ -72,4 +72,3 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
       CFRelease(power_sources);
    }
 }
-

darwin/DarwinCRT.c

@@ -15,7 +15,7 @@ void CRT_handleSIGSEGV(int sgn) {
    (void) sgn;
    CRT_done();
    #ifdef __APPLE__
-   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://hisham.hm/htop\n");
+   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at https://htop.dev\n");
    #ifdef HAVE_EXECINFO_H
    size_t size = backtrace(backtraceArray, sizeof(backtraceArray) / sizeof(void *));
    fprintf(stderr, "\n Please include in your report the following backtrace: \n");
@@ -32,4 +32,3 @@ void CRT_handleSIGSEGV(int sgn) {
    #endif
    abort();
 }
-

dragonflybsd/DragonFlyBSDCRT.c

@@ -17,7 +17,7 @@ in the source distribution for its full text.
 void CRT_handleSIGSEGV(int sgn) {
    (void) sgn;
    CRT_done();
-   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://hisham.hm/htop\n");
+   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at https://htop.dev\n");
    #ifdef HAVE_EXECINFO_H
    size_t size = backtrace(backtraceArray, sizeof(backtraceArray) / sizeof(void *));
    fprintf(stderr, "\n Please include in your report the following backtrace: \n");
@@ -32,4 +32,3 @@ void CRT_handleSIGSEGV(int sgn) {
    #endif
    abort();
 }
-

freebsd/FreeBSDCRT.c

@@ -18,4 +18,3 @@ void CRT_handleSIGSEGV(int sgn) {
    fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
    abort();
 }
-

freebsd/FreeBSDProcessList.c

@@ -325,17 +325,6 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) {
    cachedMem *= pageSizeKb;
    pl->cachedMem = cachedMem;
 
-   if (fpl->zfsArcEnabled) {
-      len = sizeof(memZfsArc);
-      sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(memZfsArc), &len , NULL, 0);
-      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;

htop.1.in

@@ -48,6 +48,9 @@ Sort by this column (use \-\-sort\-key help for a column list)
 \fB\-u \-\-user=USERNAME\fR
 Show only the processes of a given user
 .TP
+\fB\-U \-\-no-unicode\fR
+Do not use unicode but ASCII characters for graph meters
+.TP
 \fB\-v \-\-version
 Output version information and exit
 .TP

htop.c

@@ -29,14 +29,12 @@ in the source distribution for its full text.
 //#link m
 
 static void printVersionFlag() {
-   fputs("htop " VERSION " - " COPYRIGHT "\n"
-         "Released under the GNU GPL.\n\n",
-         stdout);
+   fputs("htop " VERSION "\n", stdout);
    exit(0);
 }
 
 static void printHelpFlag() {
-   fputs("htop " VERSION " - " COPYRIGHT "\n"
+   fputs("htop " VERSION "\n"
          "Released under the GNU GPL.\n\n"
          "-C --no-color               Use a monochrome color scheme\n"
          "-m --no-mouse               Disable the mouse\n"
@@ -45,6 +43,7 @@ static void printHelpFlag() {
          "-s --sort-key=COLUMN        Sort by COLUMN (try --sort-key=help for a list)\n"
          "-t --tree                   Show the tree view by default\n"
          "-u --user[=USERNAME]        Show only processes for a given user (or $USER)\n"
+         "-U --no-unicode             Do not use unicode but plain ASCII\n"
          "-p --pid=PID,[,PID,PID...]  Show only the given PIDs\n"
          "-v --version                Print version info\n"
          "\n"
@@ -65,6 +64,7 @@ typedef struct CommandLineSettings_ {
    bool useColors;
    bool enableMouse;
    bool treeView;
+   bool allowUnicode;
 } CommandLineSettings;
 
 static CommandLineSettings parseArguments(int argc, char** argv) {
@@ -77,26 +77,28 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
       .useColors = true,
       .enableMouse = true,
       .treeView = false,
+      .allowUnicode = true,
    };
 
    static struct option long_opts[] =
    {
-      {"help",     no_argument,         0, 'h'},
-      {"version",  no_argument,         0, 'v'},
-      {"delay",    required_argument,   0, 'd'},
-      {"sort-key", required_argument,   0, 's'},
-      {"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'},
+      {"help",       no_argument,         0, 'h'},
+      {"version",    no_argument,         0, 'v'},
+      {"delay",      required_argument,   0, 'd'},
+      {"sort-key",   required_argument,   0, 's'},
+      {"user",       optional_argument,   0, 'u'},
+      {"no-color",   no_argument,         0, 'C'},
+      {"no-colour",  no_argument,         0, 'C'},
+      {"no-mouse",   no_argument,         0, 'm'},
+      {"no-unicode", no_argument,         0, 'U'},
+      {"tree",       no_argument,         0, 't'},
+      {"pid",        required_argument,   0, 'p'},
       {0,0,0,0}
    };
 
    int opt, opti=0;
    /* Parse arguments */
-   while ((opt = getopt_long(argc, argv, "hvmCs:td:u::p:", long_opts, &opti))) {
+   while ((opt = getopt_long(argc, argv, "hvmCs:td:u:Up:", long_opts, &opti))) {
       if (opt == EOF) break;
       switch (opt) {
          case 'h':
@@ -150,6 +152,9 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
          case 'm':
             flags.enableMouse = false;
             break;
+         case 'U':
+            flags.allowUnicode = false;
+            break;
          case 't':
             flags.treeView = true;
             break;
@@ -200,7 +205,7 @@ int main(int argc, char** argv) {
 
    CommandLineSettings flags = parseArguments(argc, argv); // may exit()
 
-#ifdef HAVE_PROC
+#ifdef HTOP_LINUX
    if (access(PROCDIR, R_OK) != 0) {
       fprintf(stderr, "Error: could not read procfs (compiled to look in %s).\n", PROCDIR);
       exit(1);
@@ -228,7 +233,7 @@ int main(int argc, char** argv) {
    if (flags.treeView)
       settings->treeView = true;
 
-   CRT_init(settings->delay, settings->colorScheme);
+   CRT_init(settings->delay, settings->colorScheme, flags.allowUnicode);
 
    MainPanel* panel = MainPanel_new();
    ProcessList_setPanel(pl, (Panel*) panel);

linux/Battery.c

@@ -64,7 +64,7 @@ static unsigned long int parseBatInfo(const char *fileName, const unsigned short
       }
 
       char* line = NULL;
-      for (unsigned short int i = 0; i < lineNum; i++) {
+      for (unsigned short int j = 0; j < lineNum; j++) {
          free(line);
          line = String_readLine(file);
          if (!line) break;
@@ -107,7 +107,7 @@ static ACPresence procAcpiCheck() {
       if (entryName[0] != 'A')
          continue;
 
-      char statePath[50];
+      char statePath[256];
       xSnprintf((char *) statePath, sizeof statePath, "%s/%s/state", power_supplyPath, entryName);
       FILE* file = fopen(statePath, "r");
       if (!file) {
@@ -191,29 +191,29 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
       if (!dirEntry)
          break;
       char* entryName = (char *) dirEntry->d_name;
-      const char filePath[50];
+      const char filePath[256];
 
       xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/type", entryName);
-      int fd = open(filePath, O_RDONLY);
-      if (fd == -1)
+      int fd1 = open(filePath, O_RDONLY);
+      if (fd1 == -1)
          continue;
 
       char type[8];
-      ssize_t typelen = xread(fd, type, 7);
-      close(fd);
+      ssize_t typelen = xread(fd1, type, 7);
+      close(fd1);
       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) {
+         int fd2 = open(filePath, O_RDONLY);
+         if (fd2 == -1) {
             closedir(dir);
             return;
          }
          char buffer[1024];
-         ssize_t buflen = xread(fd, buffer, 1023);
-         close(fd);
+         ssize_t buflen = xread(fd2, buffer, 1023);
+         close(fd2);
          if (buflen < 1) {
             closedir(dir);
             return;
@@ -259,18 +259,18 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
          }
 
          xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/online", entryName);
-         int fd = open(filePath, O_RDONLY);
-         if (fd == -1) {
+         int fd3 = open(filePath, O_RDONLY);
+         if (fd3 == -1) {
             closedir(dir);
             return;
          }
          char buffer[2] = "";
          for(;;) {
-            ssize_t res = read(fd, buffer, 1);
+            ssize_t res = read(fd3, buffer, 1);
             if (res == -1 && errno == EINTR) continue;
             break;
          }
-         close(fd);
+         close(fd3);
          if (buffer[0] == '0') {
             *isOnAC = AC_ABSENT;
          } else if (buffer[0] == '1') {

linux/IOPriority.c

@@ -38,4 +38,3 @@ typedef int IOPriority;
 #define IOPriority_Idle IOPriority_tuple(IOPRIO_CLASS_IDLE, 7)
 
 }*/
-

linux/IOPriority.h

@@ -39,5 +39,4 @@ typedef int IOPriority;
 #define IOPriority_Idle IOPriority_tuple(IOPRIO_CLASS_IDLE, 7)
 
 
-
 #endif

linux/IOPriorityPanel.c

@@ -41,4 +41,3 @@ Panel* IOPriorityPanel_new(IOPriority currPrio) {
 IOPriority IOPriorityPanel_getIOPriority(Panel* this) {
    return (IOPriority) ( ((ListItem*) Panel_getSelected(this))->key );
 }
-

linux/IOPriorityPanel.h

@@ -17,5 +17,4 @@ extern Panel* IOPriorityPanel_new(IOPriority currPrio);
 
 extern IOPriority IOPriorityPanel_getIOPriority(Panel* this);
 
-
 #endif

linux/LinuxCRT.c

@@ -17,7 +17,7 @@ void CRT_handleSIGSEGV(int sgn) {
    (void) sgn;
    CRT_done();
    #ifdef __linux
-   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://hisham.hm/htop\n");
+   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at https://htop.dev\n");
    #ifdef HAVE_EXECINFO_H
    size_t size = backtrace(backtraceArray, sizeof(backtraceArray) / sizeof(void *));
    fprintf(stderr, "\n Please include in your report the following backtrace: \n");

linux/LinuxProcess.c

@@ -241,7 +241,7 @@ ProcessFieldData Process_fields[] = {
 #ifdef HAVE_CGROUP
    [CGROUP] = { .name = "CGROUP", .title = "    CGROUP ", .description = "Which cgroup the process is in", .flags = PROCESS_FLAG_LINUX_CGROUP, },
 #endif
-   [OOM] = { .name = "OOM", .title = "    OOM ", .description = "OOM (Out-of-Memory) killer score", .flags = PROCESS_FLAG_LINUX_OOM, },
+   [OOM] = { .name = "OOM", .title = " OOM ", .description = "OOM (Out-of-Memory) killer score", .flags = PROCESS_FLAG_LINUX_OOM, },
    [IO_PRIORITY] = { .name = "IO_PRIORITY", .title = "IO ", .description = "I/O priority", .flags = PROCESS_FLAG_LINUX_IOPRIO, },
 #ifdef HAVE_DELAYACCT
    [PERCENT_CPU_DELAY] = { .name = "PERCENT_CPU_DELAY", .title = "CPUD% ", .description = "CPU delay %", .flags = 0, },
@@ -264,7 +264,6 @@ ProcessPidColumn Process_pidColumns[] = {
    { .id = TGID, .label = "TGID" },
    { .id = PGRP, .label = "PGRP" },
    { .id = SESSION, .label = "SID" },
-   { .id = OOM, .label = "OOM" },
    { .id = 0, .label = NULL },
 };
 
@@ -397,7 +396,7 @@ void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field)
    #ifdef HAVE_CGROUP
    case CGROUP: xSnprintf(buffer, n, "%-10s ", lp->cgroup); break;
    #endif
-   case OOM: xSnprintf(buffer, n, Process_pidFormat, lp->oom); break;
+   case OOM: xSnprintf(buffer, n, "%4u ", lp->oom); break;
    case IO_PRIORITY: {
       int klass = IOPriority_class(lp->ioPriority);
       if (klass == IOPRIO_CLASS_NONE) {
@@ -493,7 +492,7 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
       return strcmp(p1->cgroup ? p1->cgroup : "", p2->cgroup ? p2->cgroup : "");
    #endif
    case OOM:
-      return (p2->oom - p1->oom);
+      return ((int)p2->oom - (int)p1->oom);
    #ifdef HAVE_DELAYACCT
    case PERCENT_CPU_DELAY:
       return (p2->cpu_delay_percent > p1->cpu_delay_percent ? 1 : -1);
@@ -514,4 +513,3 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
 bool Process_isThread(Process* this) {
    return (Process_isUserlandThread(this) || Process_isKernelThread(this));
 }
-

linux/LinuxProcess.h

@@ -189,5 +189,4 @@ extern long LinuxProcess_compare(const void* v1, const void* v2);
 
 extern bool Process_isThread(Process* this);
 
-
 #endif

linux/LinuxProcessList.c

@@ -275,7 +275,8 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
       } else if (String_startsWith(buffer, "cpu")) {
          cpus++;
       } else if (String_startsWith(buffer, "btime ")) {
-         sscanf(buffer, "btime %lld\n", &btime);
+         if (sscanf(buffer, "btime %lld\n", &btime) != 1)
+            CRT_fatalError("Failed to parse btime from " PROCSTATFILE);
          break;
       }
    } while(true);
@@ -577,7 +578,7 @@ static void LinuxProcessList_readOpenVZData(LinuxProcess* process, const char* d
    FILE* file = fopen(filename, "r");
    if (!file)
       return;
-   (void) fscanf(file,
+   (void)! fscanf(file,
       "%*32u %*32s %*1c %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
       "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
       "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
@@ -670,7 +671,7 @@ static void LinuxProcessList_readOomData(LinuxProcess* process, const char* dirn
    char buffer[PROC_LINE_LENGTH + 1];
    if (fgets(buffer, PROC_LINE_LENGTH, file)) {
       unsigned int oom;
-      int ok = sscanf(buffer, "%32u", &oom);
+      int ok = sscanf(buffer, "%u", &oom);
       if (ok >= 1) {
          process->oom = oom;
       }
@@ -822,11 +823,11 @@ static char* LinuxProcessList_updateTtyDevice(TtyDriver* ttyDrivers, unsigned in
       struct stat sstat;
       char* fullPath;
       for(;;) {
-         asprintf(&fullPath, "%s/%d", ttyDrivers[i].path, idx);
+         xAsprintf(&fullPath, "%s/%d", ttyDrivers[i].path, idx);
          int err = stat(fullPath, &sstat);
          if (err == 0 && major(sstat.st_rdev) == maj && minor(sstat.st_rdev) == min) return fullPath;
          free(fullPath);
-         asprintf(&fullPath, "%s%d", ttyDrivers[i].path, idx);
+         xAsprintf(&fullPath, "%s%d", ttyDrivers[i].path, idx);
          err = stat(fullPath, &sstat);
          if (err == 0 && major(sstat.st_rdev) == maj && minor(sstat.st_rdev) == min) return fullPath;
          free(fullPath);
@@ -837,7 +838,7 @@ static char* LinuxProcessList_updateTtyDevice(TtyDriver* ttyDrivers, unsigned in
       if (err == 0 && tty_nr == sstat.st_rdev) return strdup(ttyDrivers[i].path);
    }
    char* out;
-   asprintf(&out, "/dev/%u:%u", maj, min);
+   xAsprintf(&out, "/dev/%u:%u", maj, min);
    return out;
 }
 
@@ -1062,9 +1063,9 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) {
 }
 
 static inline void LinuxProcessList_scanZfsArcstats(LinuxProcessList* lpl) {
-   unsigned long long int dbufSize;
-   unsigned long long int dnodeSize;
-   unsigned long long int bonusSize;
+   unsigned long long int dbufSize = 0;
+   unsigned long long int dnodeSize = 0;
+   unsigned long long int bonusSize = 0;
 
    FILE* file = fopen(PROCARCSTATSFILE, "r");
    if (file == NULL) {
@@ -1142,10 +1143,10 @@ static inline double LinuxProcessList_scanCPUTime(LinuxProcessList* this) {
       char* ok = fgets(buffer, PROC_LINE_LENGTH, file);
       if (!ok) buffer[0] = '\0';
       if (i == 0)
-         sscanf(buffer,   "cpu  %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu",         &usertime, &nicetime, &systemtime, &idletime, &ioWait, &irq, &softIrq, &steal, &guest, &guestnice);
+         (void) sscanf(buffer,   "cpu  %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu",         &usertime, &nicetime, &systemtime, &idletime, &ioWait, &irq, &softIrq, &steal, &guest, &guestnice);
       else {
          int cpuid;
-         sscanf(buffer, "cpu%4d %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu", &cpuid, &usertime, &nicetime, &systemtime, &idletime, &ioWait, &irq, &softIrq, &steal, &guest, &guestnice);
+         (void) sscanf(buffer, "cpu%4d %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu", &cpuid, &usertime, &nicetime, &systemtime, &idletime, &ioWait, &irq, &softIrq, &steal, &guest, &guestnice);
          assert(cpuid == i - 1);
       }
       // Guest time is already accounted in usertime
@@ -1227,15 +1228,15 @@ static inline double LinuxProcessList_scanCPUFrequency(LinuxProcessList* this) {
             (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);
+               char tmpbuffer[64];
+               xSnprintf(tmpbuffer, sizeof(tmpbuffer), PROCCPUINFOFILE " contains out-of-range CPU number %d", cpuid);
+               CRT_fatalError(tmpbuffer);
             }
          } else if (
             (sscanf(buffer, "cpu MHz : %lf", &frequency) == 1) ||
             (sscanf(buffer, "cpu MHz: %lf", &frequency) == 1)
          ) {
-            if (cpuid < 0) {
+            if (cpuid < 0 || cpuid > (cpus - 1)) {
                CRT_fatalError(PROCCPUINFOFILE " is malformed: cpu MHz line without corresponding processor line");
             }
 

linux/Platform.c

@@ -44,7 +44,7 @@ in the source distribution for its full text.
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
-ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, M_SHARE, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
+ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, (int)M_SHARE, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
 //static ProcessField defaultIoFields[] = { PID, IO_PRIORITY, USER, IO_READ_RATE, IO_WRITE_RATE, IO_RATE, COMM, 0 };
 
@@ -94,12 +94,12 @@ static Htop_Reaction Platform_actionSetIOPriority(State* st) {
 
    LinuxProcess* p = (LinuxProcess*) Panel_getSelected(panel);
    if (!p) return HTOP_OK;
-   IOPriority ioprio = p->ioPriority;
-   Panel* ioprioPanel = IOPriorityPanel_new(ioprio);
+   IOPriority ioprio1 = p->ioPriority;
+   Panel* ioprioPanel = IOPriorityPanel_new(ioprio1);
    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, (Arg){ .i = ioprio }, NULL);
+      IOPriority ioprio2 = IOPriorityPanel_getIOPriority(ioprioPanel);
+      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) LinuxProcess_setIOPriority, (Arg){ .i = ioprio2 }, NULL);
       if (!ok)
          beep();
    }

openbsd/OpenBSDCRT.c

@@ -19,4 +19,3 @@ void CRT_handleSIGSEGV(int sgn) {
    fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
    abort();
 }
-

openbsd/OpenBSDProcessList.c

@@ -400,4 +400,3 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    OpenBSDProcessList_scanProcs(opl);
    OpenBSDProcessList_scanCPUTime(opl);
 }
-

scripts/MakeHeader.py.in

@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-import os, sys, string, io
+#!/usr/bin/env @PYTHON@
+import os, sys, io
 try:
    from StringIO import StringIO
 except ImportError:

solaris/Battery.c

@@ -5,4 +5,3 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
    *level = -1;
    *isOnAC = AC_ERROR;
 }
-

solaris/SolarisCRT.c

@@ -17,7 +17,7 @@ in the source distribution for its full text.
 void CRT_handleSIGSEGV(int sgn) {
    (void) sgn;
    CRT_done();
-   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://hisham.hm/htop\n");
+   fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at https://htop.dev\n");
    #ifdef HAVE_EXECINFO_H
    size_t size = backtrace(backtraceArray, sizeof(backtraceArray) / sizeof(void *));
    fprintf(stderr, "\n Please include in your report the following backtrace: \n");

solaris/SolarisProcessList.c

@@ -419,4 +419,3 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    this->kernelThreads = 1;
    proc_walk(&SolarisProcessList_walkproc, this, PR_WALK_LWP);
 }
-

test_spec.lua

@@ -685,4 +685,3 @@ describe("htop test suite", function()
       os.execute("make lcov && xdg-open lcov/index.html")
    end)
 end)
-

unsupported/Battery.c

@@ -5,4 +5,3 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
    *level = -1;
    *isOnAC = AC_ERROR;
 }
-

unsupported/UnsupportedCRT.c

@@ -18,4 +18,3 @@ void CRT_handleSIGSEGV(int sgn) {
    fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
    abort();
 }
-

unsupported/UnsupportedProcess.c

@@ -30,4 +30,3 @@ void UnsupportedProcess_delete(Object* cast) {
    // free platform-specific fields here
    free(this);
 }
-

zfs/ZfsArcMeter.c

@@ -60,7 +60,6 @@ static void ZfsArcMeter_display(Object* cast, RichString* out) {
    Meter* this = (Meter*)cast;
 
    if (this->values[5] > 0) {
-      RichString_write(out, CRT_colors[METER_TEXT], ":");
       Meter_humanUnit(buffer, this->total, 50);
       RichString_append(out, CRT_colors[METER_VALUE], buffer);
       Meter_humanUnit(buffer, this->values[5], 50);
@@ -100,5 +99,5 @@ MeterClass ZfsArcMeter_class = {
    .attributes = ZfsArcMeter_attributes,
    .name = "ZFSARC",
    .uiName = "ZFS ARC",
-   .caption = "ARC"
+   .caption = "ARC: "
 };

zfs/ZfsArcMeter.h

@@ -15,7 +15,7 @@ in the source distribution for its full text.
 
 extern int ZfsArcMeter_attributes[];
 
-void ZfsArcMeter_readStats(Meter* this, ZfsArcStats* stats);
+extern void ZfsArcMeter_readStats(Meter* this, ZfsArcStats* stats);
 
 extern MeterClass ZfsArcMeter_class;
 

zfs/ZfsArcStats.c

@@ -20,3 +20,5 @@ typedef struct ZfsArcStats_ {
    unsigned long long int uncompressed;
 } ZfsArcStats;
 }*/
+
+static int make_iso_compilers_happy __attribute__((unused));

zfs/ZfsArcStats.h

@@ -23,4 +23,5 @@ typedef struct ZfsArcStats_ {
    unsigned long long int uncompressed;
 } ZfsArcStats;
 
+
 #endif