Merge branch 'htop-dev:main' into main

Author: Alex313031

.github/workflows/ci.yml

@@ -230,7 +230,7 @@ jobs:
         - name: Compile
           uses: vmactions/freebsd-vm@v1
           with:
-            release: '14.1'
+            release: '14.2'
             usesh: true
             prepare: |
               pkg install -y gmake autoconf automake pkgconf git
@@ -251,11 +251,11 @@ jobs:
         - name: Compile
           uses: vmactions/netbsd-vm@v1
           with:
-            release: '10.0'
+            release: '10.1'
             usesh: true
             prepare: |
               PATH="/usr/pkg/sbin:/usr/pkg/bin:$PATH"
-              PKG_PATH="https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.0/All/"
+              PKG_PATH="https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.1/All/"
               export PATH PKG_PATH
               /usr/sbin/pkg_add pkgin
               pkgin -y install autoconf automake libtool ncurses pkg-config gmake git
@@ -276,7 +276,7 @@ jobs:
         - name: Compile
           uses: vmactions/openbsd-vm@v1
           with:
-            release: '7.4'
+            release: '7.6'
             usesh: true
             prepare: |
               pkg_add gmake git

DisplayOptionsPanel.c

@@ -149,6 +149,7 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
                                                  &(settings->showCPUTemperature)));
    Panel_add(super, (Object*) CheckItem_newByRef("- Show temperature in degree Fahrenheit instead of Celsius", &(settings->degreeFahrenheit)));
    #endif
+   Panel_add(super, (Object*) CheckItem_newByRef("Show cached memory in graph and bar modes", &(settings->showCachedMemory)));
    #ifdef HAVE_GETMOUSE
    Panel_add(super, (Object*) CheckItem_newByRef("Enable the mouse", &(settings->enableMouse)));
    #endif

MemoryMeter.c

@@ -33,12 +33,17 @@ static void MemoryMeter_updateValues(Meter* this) {
    size_t size = sizeof(this->txtBuffer);
    int written;
 
+   Settings *settings = this->host->settings;
+
    /* shared, compressed and available memory are not supported on all platforms */
    this->values[MEMORY_METER_SHARED] = NAN;
    this->values[MEMORY_METER_COMPRESSED] = NAN;
    this->values[MEMORY_METER_AVAILABLE] = NAN;
    Platform_setMemoryValues(this);
-
+   if ((this->mode == GRAPH_METERMODE || this->mode == BAR_METERMODE) && !settings->showCachedMemory) {
+      this->values[MEMORY_METER_BUFFERS] = 0;
+      this->values[MEMORY_METER_CACHE] = 0;
+   }
    /* Do not print available memory in bar mode */
    static_assert(MEMORY_METER_AVAILABLE + 1 == MEMORY_METER_ITEMCOUNT,
       "MEMORY_METER_AVAILABLE is not the last item in MemoryMeterValues");

Settings.c

@@ -466,6 +466,8 @@ static bool Settings_read(Settings* this, const char* fileName, const Machine* h
          this->showCPUUsage = atoi(option[1]);
       } else if (String_eq(option[0], "show_cpu_frequency")) {
          this->showCPUFrequency = atoi(option[1]);
+      } else if (String_eq(option[0], "show_cached_memory")) {
+         this->showCachedMemory = atoi(option[1]);
       #ifdef BUILD_WITH_CPU_TEMP
       } else if (String_eq(option[0], "show_cpu_temperature")) {
          this->showCPUTemperature = atoi(option[1]);
@@ -650,11 +652,15 @@ int Settings_write(const Settings* this, bool onCrash) {
       xAsprintf(&tmpFilename, "%s.tmp.XXXXXX", this->filename);
       int fdtmp = mkstemp(tmpFilename);
       umask(cur_umask);
-      if (fdtmp == -1)
+      if (fdtmp == -1) {
+         free(tmpFilename);
          return -errno;
+      }
       fp = fdopen(fdtmp, "w");
-      if (!fp)
+      if (!fp) {
+         free(tmpFilename);
          return -errno;
+      }
       separator = '\n';
       of = fprintf;
    }
@@ -697,6 +703,7 @@ int Settings_write(const Settings* this, bool onCrash) {
    printSettingInteger("show_cpu_temperature", this->showCPUTemperature);
    printSettingInteger("degree_fahrenheit", this->degreeFahrenheit);
    #endif
+   printSettingInteger("show_cached_memory", this->showCachedMemory);
    printSettingInteger("update_process_names", this->updateProcessNames);
    printSettingInteger("account_guest_in_cpu_meter", this->accountGuestInCPUMeter);
    printSettingInteger("color_scheme", this->colorScheme);
@@ -801,6 +808,7 @@ Settings* Settings_new(const Machine* host, Hashtable* dynamicMeters, Hashtable*
    this->showCPUTemperature = false;
    this->degreeFahrenheit = false;
    #endif
+   this->showCachedMemory = true;
    this->updateProcessNames = false;
    this->showProgramPath = true;
    this->highlightThreads = true;

Settings.h

@@ -101,6 +101,7 @@ typedef struct Settings_ {
    bool accountGuestInCPUMeter;
    bool headerMargin;
    bool screenTabs;
+   bool showCachedMemory;
    #ifdef HAVE_GETMOUSE
    bool enableMouse;
    #endif

configure.ac

@@ -1109,7 +1109,7 @@ AC_SUBST([AM_CPPFLAGS])
 # We're done, let's go!
 # ----------------------------------------------------------------------
 
-AC_DEFINE_UNQUOTED([COPYRIGHT], ["(C) 2004-2019 Hisham Muhammad. (C) 2020-2024 htop dev team."], [Copyright message.])
+AC_DEFINE_UNQUOTED([COPYRIGHT], ["(C) 2004-2019 Hisham Muhammad. (C) 2020-2025 htop dev team."], [Copyright message.])
 
 AM_CONDITIONAL([HTOP_LINUX], [test "$my_htop_platform" = linux])
 AM_CONDITIONAL([HTOP_FREEBSD], [test "$my_htop_platform" = freebsd])

darwin/PlatformHelpers.c

@@ -103,15 +103,12 @@ double Platform_calculateNanosecondsPerMachTick(void) {
     *    the "Apple M1" chip specifically when running under Rosetta 2.
     */
 
-   char cpuBrandString[1024] = "";
-   Platform_getCPUBrandString(cpuBrandString, sizeof(cpuBrandString));
-
    bool isRunningUnderRosetta2 = Platform_isRunningTranslated();
 
    // Kernel version 20.0.0 is macOS 11.0 (Big Sur)
    bool isBuggedVersion = Platform_KernelVersionIsBetween((KernelVersion) {20, 0, 0}, (KernelVersion) {999, 999, 999});
 
-   if (isRunningUnderRosetta2 && String_eq(cpuBrandString, "Apple M1") && isBuggedVersion) {
+   if (isRunningUnderRosetta2 && isBuggedVersion) {
       // In this case `mach_timebase_info` provides the wrong value, so we hard-code the correct factor,
       // as determined from `mach_timebase_info` when the process running natively.
       info = (mach_timebase_info_data_t) { .numer = 125, .denom = 3 };

dragonflybsd/DragonFlyBSDMachine.c

@@ -240,18 +240,20 @@ static void DragonFlyBSDMachine_scanMemoryInfo(Machine* super) {
    sysctl(MIB_hw_physmem, 2, &(super->totalMem), &len, NULL, 0);
    super->totalMem /= 1024;
 
-   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(this->memActive), &len, NULL, 0);
-   this->memActive *= this->pageSizeKb;
+   unsigned long long int memActive = 0;
+   sysctl(MIB_vm_stats_vm_v_active_count, 4, &memActive, &len, NULL, 0);
+   memActive *= this->pageSizeKb;
 
-   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(this->memWire), &len, NULL, 0);
-   this->memWire *= this->pageSizeKb;
+   unsigned long long int memWire = 0;
+   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &memWire, &len, NULL, 0);
+   memWire *= this->pageSizeKb;
 
    sysctl(MIB_vfs_bufspace, 2, &(super->buffersMem), &len, NULL, 0);
    super->buffersMem /= 1024;
 
    sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(super->cachedMem), &len, NULL, 0);
    super->cachedMem *= this->pageSizeKb;
-   super->usedMem = this->memActive + this->memWire;
+   super->usedMem = memActive + memWire;
 
    struct kvm_swap swap[16];
    int nswap = kvm_getswapinfo(this->kd, swap, ARRAYSIZE(swap), 0);

dragonflybsd/DragonFlyBSDMachine.h

@@ -42,11 +42,6 @@ typedef struct DragonFlyBSDMachine_ {
    int pageSizeKb;
    int kernelFScale;
 
-   unsigned long long int memWire;
-   unsigned long long int memActive;
-   unsigned long long int memInactive;
-   unsigned long long int memFree;
-
    CPUData* cpus;
 
    unsigned long* cp_time_o;

freebsd/FreeBSDMachine.c

@@ -313,17 +313,21 @@ static void FreeBSDMachine_scanMemoryInfo(Machine* super) {
    // @etosan:
    // memory counter relationships seem to be these:
    //  total = active + wired + inactive + cache + free
-   //  htop_used (unavail to anybody) = active + wired
-   //  htop_cache (for cache meter)   = buffers + cache
-   //  user_free (avail to procs)     = buffers + inactive + cache + free
+   //  htop_used (unavail to anybody)   = active + wired + inactive - buffer
+   //  htop_cache (for cache meter)     = buffer + cache
+   //  htop_user_free (avail to procs)  = buffer + cache + free
+   //  htop_buffers (disk write buffer) = 0 (not applicable to FreeBSD)
+   //
+   // 'buffer' contain cache used by most file systems other than ZFS, and is
+   // included in 'wired'
    //
    // with ZFS ARC situation becomes bit muddled, as ARC behaves like "user_free"
    // and belongs into cache, but is reported as wired by kernel
    //
    // htop_used   = active + (wired - arc)
    // htop_cache  = buffers + cache + arc
    u_long totalMem;
-   u_int memActive, memWire, cachedMem;
+   u_int memActive, memWire, memInactive, cachedMem;
    long buffersMem;
    size_t len;
    struct vmtotal vmtotal;
@@ -340,28 +344,30 @@ static void FreeBSDMachine_scanMemoryInfo(Machine* super) {
    len = sizeof(memActive);
    sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0);
    memActive *= this->pageSizeKb;
-   this->memActive = memActive;
 
    len = sizeof(memWire);
    sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0);
    memWire *= this->pageSizeKb;
-   this->memWire = memWire;
+
+   len = sizeof(memInactive);
+   sysctl(MIB_vm_stats_vm_v_inactive_count, 4, &(memInactive), &len, NULL, 0);
+   memInactive *= this->pageSizeKb;
 
    len = sizeof(buffersMem);
    sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0);
    buffersMem /= 1024;
-   super->buffersMem = buffersMem;
+   super->cachedMem = buffersMem;
 
    len = sizeof(cachedMem);
    sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0);
    cachedMem *= this->pageSizeKb;
-   super->cachedMem = cachedMem;
+   super->cachedMem += cachedMem;
 
    len = sizeof(vmtotal);
    sysctl(MIB_vm_vmtotal, 2, &(vmtotal), &len, NULL, 0);
    super->sharedMem = vmtotal.t_rmshr * this->pageSizeKb;
 
-   super->usedMem = this->memActive + this->memWire;
+   super->usedMem = memActive + memWire + memInactive - buffersMem;
 
    struct kvm_swap swap[16];
    int nswap = kvm_getswapinfo(this->kd, swap, ARRAYSIZE(swap), 0);

freebsd/FreeBSDMachine.h

@@ -36,9 +36,6 @@ typedef struct FreeBSDMachine_ {
    int pageSizeKb;
    int kernelFScale;
 
-   unsigned long long int memWire;
-   unsigned long long int memActive;
-
    ZfsArcStats zfs;
 
    CPUData* cpus;

htop.1.in

@@ -1,4 +1,4 @@
-.TH "HTOP" "1" "2024" "@PACKAGE_STRING@" "User Commands"
+.TH "HTOP" "1" "2025" "@PACKAGE_STRING@" "User Commands"
 .SH "NAME"
 htop, pcp-htop \- interactive process viewer
 .SH "SYNOPSIS"
@@ -702,7 +702,7 @@ communities, and forms part of the Performance Co-Pilot suite of tools.
 .SH "COPYRIGHT"
 Copyright \(co 2004-2019 Hisham Muhammad.
 .br
-Copyright \(co 2020-2024 htop dev team.
+Copyright \(co 2020-2025 htop dev team.
 .LP
 License GPLv2+: GNU General Public License version 2 or, at your option, any later version.
 .LP