From 141452e9c43e7031f624b03f5475127d3c726d5b Mon Sep 17 00:00:00 2001
From: WHR <msl0000023508@gmail.com>
Date: Tue, 7 Jan 2025 02:15:41 +0000
Subject: [PATCH] Fix issues related to memory usage reporting for
 kFreeBSD-based platforms:

* 'inactive' pages are not treated as used memory as it should be.
* 'wired' pages contain VFS buffer (considered as cache by htop), but the
  amount didn't get subtracted from used memory.
* VFS buffer as reported by the kernel should belong to htop's 'cached'
  memory, but htop currently classified it as 'buffers', which is a different
  concept originated from Linux.
---
 freebsd/FreeBSDMachine.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/freebsd/FreeBSDMachine.c b/freebsd/FreeBSDMachine.c
index 3a478679e..514e48600 100644
--- a/freebsd/FreeBSDMachine.c
+++ b/freebsd/FreeBSDMachine.c
@@ -313,9 +313,13 @@ 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
@@ -323,7 +327,7 @@ static void FreeBSDMachine_scanMemoryInfo(Machine* super) {
    // 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;
@@ -345,21 +349,25 @@ static void FreeBSDMachine_scanMemoryInfo(Machine* super) {
    sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0);
    memWire *= this->pageSizeKb;
 
+   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 = memActive + memWire;
+   super->usedMem = memActive + memWire + memInactive - buffersMem;
 
    struct kvm_swap swap[16];
    int nswap = kvm_getswapinfo(this->kd, swap, ARRAYSIZE(swap), 0);