Merge branch 'htop-dev:main' into main

serg00ns · web-flow · commit 72a2679ab1b0 · 2025-09-02T15:41:53.000+03:00
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -11,7 +11,7 @@ jobs:
     name: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: true
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
   build-ubuntu-latest-minimal-gcc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: sudo apt-get install --no-install-recommends libncursesw5-dev
     - name: Bootstrap
@@ -33,7 +33,7 @@ jobs:
     env:
       CC: clang-18
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: install clang repo
       run: |
         ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release`
@@ -58,7 +58,7 @@ jobs:
       CFLAGS: -O3 -g -flto
       LDFLAGS: -O3 -g -flto -Wl,--as-needed
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: sudo apt-get install --no-install-recommends libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors-dev libcap-dev
     - name: Bootstrap
@@ -75,7 +75,7 @@ jobs:
     env:
       CC: clang-18
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: install clang repo
       run: |
         ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release`
@@ -100,7 +100,7 @@ jobs:
       CFLAGS: -O3 -g -flto
       LDFLAGS: -O3 -g -flto
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: sudo apt-get install --no-install-recommends libncursesw5-dev libtinfo-dev libgpm-dev libsensors-dev libcap-dev
     - name: Bootstrap
@@ -116,7 +116,7 @@ jobs:
     # we want PCP v5.2.3+
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: sudo apt-get install --no-install-recommends libpcp3-dev libncursesw5-dev libtinfo-dev libgpm-dev
     - name: Bootstrap
@@ -130,7 +130,7 @@ jobs:
     # build as if we were on an unsupported platform
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: sudo apt-get install --no-install-recommends libncursesw5-dev libtinfo-dev libgpm-dev
     - name: Bootstrap
@@ -145,7 +145,7 @@ jobs:
     env:
       CC: clang-18
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: install clang repo
       run: |
         ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release`
@@ -172,7 +172,7 @@ jobs:
       TERM: xterm-color
       HTOPRC: .github/workflows/htoprc
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: install clang repo
       run: |
         ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release`
@@ -203,7 +203,7 @@ jobs:
     env:
       CC: clang
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: brew install automake pkg-config
     - name: Bootstrap
@@ -219,7 +219,7 @@ jobs:
       runs-on: ubuntu-22.04
       timeout-minutes: 20
       steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v5
           with:
             submodules: recursive
         - name: Compile
@@ -242,7 +242,7 @@ jobs:
       runs-on: ubuntu-22.04
       timeout-minutes: 20
       steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v5
           with:
             submodules: recursive
         - name: Compile
@@ -263,7 +263,7 @@ jobs:
       runs-on: ubuntu-22.04
       timeout-minutes: 20
       steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v5
           with:
             submodules: recursive
         - name: Compile
@@ -288,7 +288,7 @@ jobs:
       runs-on: ubuntu-22.04
       timeout-minutes: 20
       steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v5
           with:
             submodules: recursive
         - name: Compile
@@ -323,7 +323,7 @@ jobs:
       runs-on: ubuntu-22.04
       timeout-minutes: 20
       steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v5
           with:
             submodules: recursive
         - name: Compile
@@ -343,13 +343,13 @@ jobs:
   lint-whitespace:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: check-whitespaces
         run: git diff-tree --check $(git hash-object -t tree /dev/null) HEAD
 
   lint-pcp-config:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: check-pcp-style
         run: ./check-pcp-style.sh
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
diff --git a/Action.h b/Action.h
@@ -36,8 +36,8 @@ typedef struct State_ {
    Machine* host;
    struct MainPanel_* mainPanel;
    Header* header;
+   const char* failedUpdate; /* function bar diagnostic or NULL if no error */
    bool pauseUpdate;
-   bool validUpdate;
    bool hideSelection;
    bool hideMeters;
 } State;
diff --git a/CommandLine.c b/CommandLine.c
@@ -383,8 +383,8 @@ int CommandLine_run(int argc, char** argv) {
       .host = host,
       .mainPanel = panel,
       .header = header,
+      .failedUpdate = NULL,
       .pauseUpdate = false,
-      .validUpdate = true,
       .hideSelection = false,
       .hideMeters = flags.hideMeters,
    };
diff --git a/MainPanel.c b/MainPanel.c
@@ -194,8 +194,8 @@ static void MainPanel_drawFunctionBar(Panel* super, bool hideFunctionBar) {
    IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);
    if (this->state->pauseUpdate) {
       FunctionBar_append("PAUSED", CRT_colors[PAUSED]);
-   } else if (!this->state->validUpdate) {
-      FunctionBar_append("FAILED", CRT_colors[FAILED_READ]);
+   } else if (this->state->failedUpdate) {
+      FunctionBar_append(this->state->failedUpdate, CRT_colors[FAILED_READ]);
    }
 }
 
diff --git a/ScreenManager.c b/ScreenManager.c
@@ -147,7 +147,7 @@ static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTi
       Machine_scan(host);
       if (!this->state->pauseUpdate)
          Machine_scanTables(host);
-      this->state->validUpdate = Platform_getValidState();
+      this->state->failedUpdate = Platform_getFailedState();
 
       // always update header, especially to avoid gaps in graph meters
       Header_updateData(this->header);
diff --git a/darwin/Platform.h b/darwin/Platform.h
@@ -88,8 +88,8 @@ static inline void Platform_getRelease(char** string) {
    *string = Generic_uname();
 }
 
-static inline bool Platform_getValidState(void) {
-   return true;
+static inline const char* Platform_getFailedState(void) {
+   return NULL;
 }
 
 #define PLATFORM_LONG_OPTIONS
diff --git a/dragonflybsd/Platform.h b/dragonflybsd/Platform.h
@@ -77,8 +77,8 @@ static inline void Platform_getRelease(char** string) {
    *string = Generic_uname();
 }
 
-static inline bool Platform_getValidState(void) {
-   return true;
+static inline const char* Platform_getFailedState(void) {
+   return NULL;
 }
 
 #define PLATFORM_LONG_OPTIONS
diff --git a/freebsd/Platform.h b/freebsd/Platform.h
@@ -77,8 +77,8 @@ static inline void Platform_getRelease(char** string) {
    *string = Generic_uname();
 }
 
-static inline bool Platform_getValidState(void) {
-   return true;
+static inline const char* Platform_getFailedState(void) {
+   return NULL;
 }
 
 #define PLATFORM_LONG_OPTIONS
diff --git a/linux/LibSensors.c b/linux/LibSensors.c
@@ -158,6 +158,8 @@ static int tempDriverPriority(const sensors_chip_name* chip) {
       { "cpu5_thermal",       0 },
       { "cpu6_thermal",       0 },
       { "cpu7_thermal",       0 },
+      /* Amlogic S905W */
+      { "scpi_sensors",       0 },
       /* Low priority drivers */
       { "acpitz",             1 },
    };
@@ -309,6 +311,17 @@ void LibSensors_getCPUTemperatures(CPUData* cpus, unsigned int existingCPUs, uns
             }
          }
 
+         /* Amlogic S905W */
+         if (String_eq(chip->prefix, "scpi_sensors")) {
+            // Package temperature - assign to ALL cores and package
+            for (size_t i = 0; i <= existingCPUs; i++) {
+               data[i] = temp;
+            }
+
+            coreTempCount = existingCPUs;
+            continue;
+         }
+
          char *label = sym_sensors_get_label(chip, feature);
          if (label) {
             bool skip = true;
diff --git a/linux/LinuxProcessTable.c b/linux/LinuxProcessTable.c
@@ -1600,7 +1600,7 @@ static bool LinuxProcessTable_recurseProcTree(LinuxProcessTable* this, openat_ar
       proc->isUserlandThread = Process_getPid(proc) != Process_getThreadGroup(proc);
       assert(proc->isUserlandThread == (mainTask != NULL));
 
-      if (mainTask) {
+      if (!mainTask) {
          // As the list of tasks/threads is presented as a flat view in procfs
          // below each directories main entry, it makes no sense to
          // look for further directories that will not be there.
diff --git a/linux/Platform.h b/linux/Platform.h
@@ -98,8 +98,8 @@ static inline void Platform_getRelease(char** string) {
    *string = Generic_uname();
 }
 
-static inline bool Platform_getValidState(void) {
-   return true;
+static inline const char* Platform_getFailedState(void) {
+   return NULL;
 }
 
 #ifdef HAVE_LIBCAP
diff --git a/netbsd/Platform.h b/netbsd/Platform.h
@@ -83,8 +83,8 @@ static inline void Platform_getRelease(char** string) {
    *string = Generic_uname();
 }
 
-static inline bool Platform_getValidState(void) {
-   return true;
+static inline const char* Platform_getFailedState(void) {
+   return NULL;
 }
 
 static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { }
diff --git a/openbsd/Platform.h b/openbsd/Platform.h
@@ -75,8 +75,8 @@ static inline void Platform_getRelease(char** string) {
    *string = Generic_uname();
 }
 
-static inline bool Platform_getValidState(void) {
-   return true;
+static inline const char* Platform_getFailedState(void) {
+   return NULL;
 }
 
 #define PLATFORM_LONG_OPTIONS
diff --git a/pcp/Platform.c b/pcp/Platform.c
@@ -794,8 +794,8 @@ void Platform_getBattery(double* level, ACPresence* isOnAC) {
    *isOnAC = AC_ERROR;
 }
 
-bool Platform_getValidState(void) {
-    return pcp->reconnect == false;
+const char* Platform_getFailedState(void) {
+   return pcp->reconnect ? "PMCD DOWN" : NULL;
 }
 
 void Platform_longOptionsUsage(ATTR_UNUSED const char* name) {
diff --git a/pcp/Platform.h b/pcp/Platform.h
@@ -115,7 +115,7 @@ void Platform_getHostname(char* buffer, size_t size);
 
 void Platform_getRelease(char** string);
 
-bool Platform_getValidState(void);
+const char* Platform_getFailedState(void);
 
 enum {
    PLATFORM_LONGOPT_HOST = 128,
diff --git a/solaris/Platform.h b/solaris/Platform.h
@@ -102,8 +102,8 @@ static inline void Platform_getRelease(char** string) {
    *string = Generic_uname();
 }
 
-static inline bool Platform_getValidState(void) {
-   return true;
+static inline const char* Platform_getFailedState(void) {
+   return NULL;
 }
 
 #define PLATFORM_LONG_OPTIONS
diff --git a/unsupported/Platform.h b/unsupported/Platform.h
@@ -67,8 +67,8 @@ void Platform_getHostname(char* buffer, size_t size);
 
 void Platform_getRelease(char** string);
 
-static inline bool Platform_getValidState(void) {
-   return true;
+static inline const char* Platform_getFailedState(void) {
+   return NULL;
 }
 
 #define PLATFORM_LONG_OPTIONS

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ static void MainPanel_drawFunctionBar(Panel* super, bool hideFunctionBar) {`
`194`	`194`	`IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);`
`195`	`195`	`if (this->state->pauseUpdate) {`
`196`	`196`	`FunctionBar_append("PAUSED", CRT_colors[PAUSED]);`
`197`		`- } else if (!this->state->validUpdate) {`
`198`		`- FunctionBar_append("FAILED", CRT_colors[FAILED_READ]);`
	`197`	`+ } else if (this->state->failedUpdate) {`
	`198`	`+ FunctionBar_append(this->state->failedUpdate, CRT_colors[FAILED_READ]);`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ static inline void Platform_getRelease(char** string) {`
`88`	`88`	`*string = Generic_uname();`
`89`	`89`	`}`
`90`	`90`
`91`		`-static inline bool Platform_getValidState(void) {`
`92`		`- return true;`
	`91`	`+static inline const char* Platform_getFailedState(void) {`
	`92`	`+ return NULL;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`#define PLATFORM_LONG_OPTIONS`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ static inline void Platform_getRelease(char** string) {`
`77`	`77`	`*string = Generic_uname();`
`78`	`78`	`}`
`79`	`79`
`80`		`-static inline bool Platform_getValidState(void) {`
`81`		`- return true;`
	`80`	`+static inline const char* Platform_getFailedState(void) {`
	`81`	`+ return NULL;`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`#define PLATFORM_LONG_OPTIONS`