Merge branch 'htop-dev:main' into main

Author: long-crypto

CPUMeter.c

@@ -241,9 +241,10 @@ static void CPUMeterCommonInit(Meter* this) {
 
    CPUMeterData* data = this->meterData;
    if (!data) {
-      data = this->meterData = xMalloc(sizeof(CPUMeterData));
+      data = xCalloc(1, sizeof(CPUMeterData));
       data->cpus = this->host->existingCPUs;
       data->meters = count ? xCalloc(count, sizeof(Meter*)) : NULL;
+      this->meterData = data;
    }
 
    Meter** meters = data->meters;

CRT.c

@@ -29,7 +29,7 @@ in the source distribution for its full text.
 #include <sys/mman.h>
 #endif
 
-#if defined(HAVE_LIBUNWIND) && defined(HAVE_LOCAL_UNWIND)
+#if defined(HAVE_LIBUNWIND_H) && defined(HAVE_LOCAL_UNWIND)
 # define PRINT_BACKTRACE
 # define UNW_LOCAL_ONLY
 # include <libunwind.h>
@@ -1142,6 +1142,11 @@ static bool terminalSupportsDefinedKeys(const char* termType) {
          return true;
       }
       break;
+   case 'f':
+      if (String_eq(termType, "foot")) {
+         return true;
+      }
+      break;
    case 's':
       if (termType[1] == 't' && IS_END_OR_DASH(termType[2])) {
          return true;
@@ -1346,7 +1351,7 @@ void CRT_setColors(int colorScheme) {
 
 #ifdef PRINT_BACKTRACE
 static void print_backtrace(void) {
-#if defined(HAVE_LIBUNWIND) && defined(HAVE_LOCAL_UNWIND)
+#if defined(HAVE_LIBUNWIND_H) && defined(HAVE_LOCAL_UNWIND)
    unw_context_t context;
    unw_getcontext(&context);
 

GPUMeter.c

@@ -103,9 +103,8 @@ static void GPUMeter_display(const Object* cast, RichString* out) {
       return;
    }
 
-   written = xSnprintf(buffer, sizeof(buffer), "%4.1f", totalUsage);
+   written = xSnprintf(buffer, sizeof(buffer), "%5.1f%%", totalUsage);
    RichString_appendnAscii(out, CRT_colors[METER_VALUE], buffer, written);
-   RichString_appendAscii(out, CRT_colors[METER_TEXT], "%");
    if (totalGPUTimeDiff != -1ULL) {
       RichString_appendAscii(out, CRT_colors[METER_TEXT], "(");
       written = humanTimeUnit(buffer, sizeof(buffer), totalGPUTimeDiff);
@@ -120,12 +119,12 @@ static void GPUMeter_display(const Object* cast, RichString* out) {
       RichString_appendAscii(out, CRT_colors[METER_TEXT], " ");
       RichString_appendAscii(out, CRT_colors[METER_TEXT], GPUMeter_engineData[i].key);
       RichString_appendAscii(out, CRT_colors[METER_TEXT], ":");
-      if (isNonnegative(this->values[i]))
-         written = xSnprintf(buffer, sizeof(buffer), "%4.1f", this->values[i]);
-      else
-         written = xSnprintf(buffer, sizeof(buffer), " N/A");
-      RichString_appendnAscii(out, CRT_colors[METER_VALUE], buffer, written);
-      RichString_appendAscii(out, CRT_colors[METER_TEXT], "%");
+      if (isNonnegative(this->values[i])) {
+         written = xSnprintf(buffer, sizeof(buffer), "%5.1f%%", this->values[i]);
+         RichString_appendnAscii(out, CRT_colors[METER_VALUE], buffer, written);
+      } else {
+         RichString_appendAscii(out, CRT_colors[METER_VALUE], " N/A");
+      }
       if (GPUMeter_engineData[i].timeDiff != -1ULL) {
          RichString_appendAscii(out, CRT_colors[METER_TEXT], "(");
          written = humanTimeUnit(buffer, sizeof(buffer), GPUMeter_engineData[i].timeDiff);

Machine.c

@@ -79,9 +79,11 @@ void Machine_populateTablesFromSettings(Machine* this, Settings* settings, Table
 
    for (size_t i = 0; i < settings->nScreens; i++) {
       ScreenSettings* ss = settings->screens[i];
+
+      if (!ss->table)
+         ss->table = processTable;
+
       Table* table = ss->table;
-      if (!table)
-         table = ss->table = processTable;
       if (i == 0)
          this->activeTable = table;
 

MemorySwapMeter.c

@@ -47,11 +47,10 @@ static void MemorySwapMeter_draw(Meter* this, int x, int y, int w) {
 }
 
 static void MemorySwapMeter_init(Meter* this) {
-   MemorySwapMeterData* data = this->meterData;
+   if (!this->meterData)
+      this->meterData = xCalloc(1, sizeof(MemorySwapMeterData));
 
-   if (!data) {
-      data = this->meterData = xCalloc(1, sizeof(MemorySwapMeterData));
-   }
+   MemorySwapMeterData* data = this->meterData;
 
    if (!data->memoryMeter)
       data->memoryMeter = Meter_new(this->host, 0, (const MeterClass*) Class(MemoryMeter));

configure.ac

@@ -182,14 +182,14 @@ m4_version_prereq(
    [AC_HEADER_STDC]
 )
 AC_CHECK_HEADERS(
-   [
-      stdlib.h
-      string.h
-      strings.h
-      sys/param.h
-      sys/time.h
-      sys/utsname.h
-      unistd.h
+   [ \
+      stdlib.h \
+      string.h \
+      strings.h \
+      sys/param.h \
+      sys/time.h \
+      sys/utsname.h \
+      unistd.h \
    ],
    [],
    [AC_MSG_ERROR([can not find required generic header files])]
@@ -402,18 +402,18 @@ fi
 
 AC_SEARCH_LIBS([clock_gettime], [rt])
 
-AC_CHECK_FUNCS([
-   clock_gettime
-   dladdr
-   faccessat
-   fstatat
-   host_get_clock_service
-   memfd_create
-   openat
-   readlinkat
-   sched_getscheduler
-   sched_setscheduler
-   strnlen
+AC_CHECK_FUNCS([ \
+   clock_gettime \
+   dladdr \
+   faccessat \
+   fstatat \
+   host_get_clock_service \
+   memfd_create \
+   openat \
+   readlinkat \
+   sched_getscheduler \
+   sched_setscheduler \
+   strnlen \
 ])
 
 # strchrnul is available in macOS since 15.4, but the user may specify an older
@@ -780,27 +780,58 @@ esac
 htop_save_CFLAGS=$CFLAGS
 CFLAGS="$AM_CFLAGS $CFLAGS"
 
+have_curses_header=no
+have_term_header=no
+
 if test "x$enable_unicode" = xyes; then
-   AC_CHECK_HEADERS([ncursesw/curses.h], [],
-      [AC_CHECK_HEADERS([ncurses/ncurses.h], [],
-         [AC_CHECK_HEADERS([ncurses/curses.h], [],
-            [AC_CHECK_HEADERS([ncurses.h], [],
-               [AC_MSG_ERROR([can not find required ncurses header file])])])])])
-
-   AC_CHECK_HEADERS([ncursesw/term.h], [],
-      [AC_CHECK_HEADERS([ncurses/term.h], [],
-         [AC_CHECK_HEADERS([term.h], [],
-            [AC_MSG_ERROR([can not find required term header file])])])])
+   AC_CHECK_HEADERS(
+      [ \
+         ncursesw/curses.h \
+         ncurses/ncurses.h \
+         ncurses/curses.h \
+         ncurses.h \
+      ], [
+         have_curses_header=yes
+         break
+      ]
+   )
+   AC_CHECK_HEADERS(
+      [ \
+         ncursesw/term.h \
+         ncurses/term.h \
+         term.h \
+      ], [
+         have_term_header=yes
+         break
+      ]
+   )
 else
-   AC_CHECK_HEADERS([curses.h], [],
-      [AC_CHECK_HEADERS([ncurses/curses.h], [],
-         [AC_CHECK_HEADERS([ncurses/ncurses.h], [],
-            [AC_CHECK_HEADERS([ncurses.h], [],
-               [AC_MSG_ERROR([can not find required ncurses header file])])])])])
-
-   AC_CHECK_HEADERS([ncurses/term.h], [],
-      [AC_CHECK_HEADERS([term.h], [],
-         [AC_MSG_ERROR([can not find required term header file])])])
+   AC_CHECK_HEADERS(
+      [ \
+         curses.h \
+         ncurses/curses.h \
+         ncurses/ncurses.h \
+         ncurses.h \
+      ], [
+         have_curses_header=yes
+         break
+      ]
+   )
+   AC_CHECK_HEADERS(
+      [ \
+         ncurses/term.h \
+         term.h \
+      ], [
+         have_term_header=yes
+         break
+      ]
+   )
+fi
+
+if test "$have_curses_header" = no; then
+   AC_MSG_ERROR([can not find required curses header file])
+elif test "$have_term_header" = no; then
+   AC_MSG_ERROR([can not find required term header file])
 fi
 
 CFLAGS="-I$srcdir $CFLAGS"
@@ -896,6 +927,25 @@ if test "x$enable_affinity" = xyes; then
 fi
 
 
+dnl HTOP_PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl This macro is a wrapper of PKG_CHECK_MODULES, which checks if
+dnl MODULES exist, and then sets VARIABLE-PREFIX_CFLAGS and
+dnl VARIABLE-PREFIX_LIBS from pkg-config --cflags and --libs output
+dnl respectively, and then runs ACTION-IF-FOUND. If pkg.m4 is absent or
+dnl pkg-config MODULES don't exist, this instead runs
+dnl ACTION-IF-NOT-FOUND. ACTION-IF-NOT-FOUND defaults to printing an
+dnl error message and exiting.
+AC_DEFUN([HTOP_PKG_CHECK_MODULES],
+   [m4_ifdef(
+      [PKG_PROG_PKG_CONFIG],
+      [PKG_CHECK_MODULES([$1], [$2], [$3], [$4])],
+      [m4_default(
+         [$4],
+         [AC_MSG_ERROR([pkg.m4 required to check for pkg-config modules '$2'; please regenerate configure script])]
+      )]
+   )]
+)
+
 # $1: Header file name
 # $2: List of directories to search, separated by spaces
 # $3: Additional include directives
@@ -944,37 +994,49 @@ case "$enable_unwind" in
    no)
       ;;
    check|yes)
-      if test "$enable_static" = yes; then
-         AC_CHECK_LIB([lzma], [lzma_index_buffer_decode])
-      fi
-
-      AC_CHECK_LIB(
-         [unwind],
-         [unw_init_local],
+      HTOP_PKG_CHECK_MODULES(LIBUNWIND, libunwind,
          [],
          [
-            if test "$enable_unwind" = yes; then
-               AC_MSG_ERROR([can not find required library libunwind])
+            if test "$enable_static" = yes; then
+               AC_CHECK_LIB([lzma], [lzma_index_buffer_decode])
             fi
-            enable_unwind=no
+            : "${LIBUNWIND_LIBS='-lunwind'}"
          ]
       )
+
+      htop_save_CFLAGS=$CFLAGS
+      CFLAGS="$AM_CFLAGS $LIBUNWIND_CFLAGS $CFLAGS"
+
+      if htop_search_header_dir libunwind.h "/usr/include/libunwind"; then
+         AC_DEFINE([HAVE_LIBUNWIND_H], 1, [Define to 1 if you have the <libunwind.h> header file.])
+      elif test "$enable_unwind" = yes; then
+         AC_MSG_ERROR([can not find required header file libunwind.h])
+      else
+         enable_unwind=no
+      fi
+
+      CFLAGS=$htop_save_CFLAGS
       ;;
    *)
       AC_MSG_ERROR([bad value '$enable_unwind' for --enable-unwind])
       ;;
 esac
 
-if test "$enable_unwind" = no; then
-   :
-elif htop_search_header_dir libunwind.h "/usr/include/libunwind"; then
+if test "$enable_unwind" != no; then
    htop_save_CPPFLAGS=$CPPFLAGS
+   htop_save_CFLAGS=$CFLAGS
+   htop_save_LIBS=$LIBS
    CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+   CFLAGS="$AM_CFLAGS $LIBUNWIND_CFLAGS $CFLAGS"
+   LIBS="$LIBUNWIND_LIBS $LIBS"
 
-   AC_MSG_CHECKING([whether local unwinding works])
+   # unw_init_local() is a macro in HP's implemention of libunwind
+   # (the most popular one, Mosberger et al.)
+   AC_MSG_CHECKING([whether $LIBUNWIND_LIBS supports local unwinding])
    AC_LINK_IFELSE(
       [AC_LANG_PROGRAM(
          [[
+#define UNW_LOCAL_ONLY
 #include <libunwind.h>
          ]], [[
          /* If libunwind is built with remote unwinding only,
@@ -1013,24 +1075,28 @@ elif htop_search_header_dir libunwind.h "/usr/include/libunwind"; then
             if test "$enable_unwind" = yes; then
                AC_MSG_WARN([this build of libunwind might not support local unwinding])
             else
+               LIBS=$htop_save_LIBS
                enable_unwind=no
             fi
          fi
       ],
       [
          AC_MSG_RESULT([no])
-         AC_MSG_FAILURE([there are problems with libunwind.h])
+         if test "$enable_unwind" = yes; then
+            AC_MSG_FAILURE([can not link with libunwind])
+         else
+            LIBS=$htop_save_LIBS
+            enable_unwind=no
+         fi
       ]
    )
 
    CPPFLAGS=$htop_save_CPPFLAGS
-elif test "$enable_unwind" = yes; then
-   AC_MSG_ERROR([can not find required header file libunwind.h])
-else
-   enable_unwind=no
+   CFLAGS=$htop_save_CFLAGS
 fi
 
 if test "$enable_unwind" != no; then
+   AM_CFLAGS="$AM_CFLAGS $LIBUNWIND_CFLAGS"
    enable_unwind=yes
    AC_DEFINE([HAVE_LOCAL_UNWIND], 1, [Define to 1 if local unwinding is enabled.])
 else
@@ -1113,17 +1179,11 @@ case "$enable_hwloc" in
    no)
       ;;
    yes)
-      m4_ifdef(
-         [PKG_PROG_PKG_CONFIG],
+      HTOP_PKG_CHECK_MODULES(HWLOC, hwloc,
          [
-            PKG_CHECK_MODULES(HWLOC, hwloc, [
-               AM_CFLAGS="$AM_CFLAGS $HWLOC_CFLAGS"
-               LIBS="$LIBS $HWLOC_LIBS"
-               AC_DEFINE([HAVE_LIBHWLOC], [1], [Define to 1 if you have the 'hwloc' library (-lhwloc).])
-            ], [
-               AC_CHECK_LIB([hwloc], [hwloc_get_proc_cpubind], [], [AC_MSG_ERROR([can not find required library libhwloc])])
-               AC_CHECK_HEADERS([hwloc.h], [], [AC_MSG_ERROR([can not find require header file hwloc.h])])
-            ])
+            AM_CFLAGS="$AM_CFLAGS $HWLOC_CFLAGS"
+            LIBS="$LIBS $HWLOC_LIBS"
+            AC_DEFINE([HAVE_LIBHWLOC], [1], [Define to 1 if you have the 'hwloc' library (-lhwloc).])
          ], [
             AC_CHECK_LIB([hwloc], [hwloc_get_proc_cpubind], [], [AC_MSG_ERROR([can not find required library libhwloc])])
             AC_CHECK_HEADERS([hwloc.h], [], [AC_MSG_ERROR([can not find require header file hwloc.h])])
@@ -1318,11 +1378,7 @@ esac
 case "$enable_delayacct" in
    check|yes)
       if test "x${LIBNL3_CFLAGS+y}" = x; then
-         m4_ifdef(
-            [PKG_PROG_PKG_CONFIG],
-            [PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [LIBNL3_CFLAGS="-I/usr/include/libnl3"])],
-            [LIBNL3_CFLAGS="-I/usr/include/libnl3"]
-         )
+         HTOP_PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [LIBNL3_CFLAGS="-I/usr/include/libnl3"])
       fi
 
       htop_save_CFLAGS=$CFLAGS