From ad72b747fa526b663c61d5cf4efc7c66e629c500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Sun, 15 Nov 2020 20:07:24 +0100 Subject: [PATCH] Drop hideThreads Setting It is only used to read process directories on RedHat beginning with a dot. Unconditionally accept directories with a starting dot. --- Action.c | 1 - Settings.c | 4 ---- Settings.h | 1 - linux/LinuxProcessList.c | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Action.c b/Action.c index e226bc53..11e87009 100644 --- a/Action.c +++ b/Action.c @@ -212,7 +212,6 @@ static Htop_Reaction actionToggleKernelThreads(State* st) { static Htop_Reaction actionToggleUserlandThreads(State* st) { st->settings->hideUserlandThreads = !st->settings->hideUserlandThreads; - st->settings->hideThreads = st->settings->hideUserlandThreads; return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS; } diff --git a/Settings.c b/Settings.c index 1ecee569..ea32ebbe 100644 --- a/Settings.c +++ b/Settings.c @@ -141,8 +141,6 @@ static bool Settings_read(Settings* this, const char* fileName, int initialCpuCo this->direction = atoi(option[1]); } else if (String_eq(option[0], "tree_view")) { this->treeView = atoi(option[1]); - } else if (String_eq(option[0], "hide_threads")) { - this->hideThreads = atoi(option[1]); } else if (String_eq(option[0], "hide_kernel_threads")) { this->hideKernelThreads = atoi(option[1]); } else if (String_eq(option[0], "hide_userland_threads")) { @@ -259,7 +257,6 @@ bool Settings_write(Settings* this) { // This "-1" is for compatibility with the older enum format. fprintf(fd, "sort_key=%d\n", (int) this->sortKey - 1); fprintf(fd, "sort_direction=%d\n", (int) this->direction); - fprintf(fd, "hide_threads=%d\n", (int) this->hideThreads); fprintf(fd, "hide_kernel_threads=%d\n", (int) this->hideKernelThreads); fprintf(fd, "hide_userland_threads=%d\n", (int) this->hideUserlandThreads); fprintf(fd, "shadow_other_users=%d\n", (int) this->shadowOtherUsers); @@ -295,7 +292,6 @@ Settings* Settings_new(int initialCpuCount) { this->sortKey = PERCENT_CPU; this->direction = 1; - this->hideThreads = false; this->shadowOtherUsers = false; this->showThreadNames = false; this->hideKernelThreads = false; diff --git a/Settings.h b/Settings.h index bbd40e16..3d8e0581 100644 --- a/Settings.h +++ b/Settings.h @@ -40,7 +40,6 @@ typedef struct Settings_ { bool showCPUFrequency; bool treeView; bool showProgramPath; - bool hideThreads; bool shadowOtherUsers; bool showThreadNames; bool hideKernelThreads; diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index b0045509..42560ca6 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -985,7 +985,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char* // The RedHat kernel hides threads with a dot. // I believe this is non-standard. - if ((!settings->hideThreads) && name[0] == '.') { + if (name[0] == '.') { name++; }