[NetBSD] available mem can be higher than total

HISTORY.rst

@@ -34,6 +34,7 @@
   1 minute).
 - 2229_, [OpenBSD]: unable to properly recognize zombie processes.
   `NoSuchProcess`_ may be raised instead of `ZombieProcess`_.
+- 2231_, [NetBSD]: *available*  `virtual_memory()`_ is higher than *total*.
 
 5.9.4
 =====

psutil/_psbsd.py

@@ -176,11 +176,11 @@
 # =====================================================================
 
 
-def virtual_memory():
-    """System virtual memory as a namedtuple."""
-    mem = cext.virtual_mem()
-    total, free, active, inactive, wired, cached, buffers, shared = mem
-    if NETBSD:
+if NETBSD:
+    def virtual_memory():
+        """System virtual memory as a namedtuple."""
+        mem = cext.virtual_mem()
+        total, free, active, inactive, wired, cached, avail = mem
         # On NetBSD buffers and shared mem is determined via /proc.
         # The C ext set them to 0.
         with open('/proc/meminfo', 'rb') as f:
@@ -191,11 +191,20 @@ def virtual_memory():
                     shared = int(line.split()[1]) * 1024
                 elif line.startswith(b'Cached:'):
                     cached = int(line.split()[1]) * 1024
-    avail = inactive + cached + free
-    used = active + wired + cached
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, used, free,
-                 active, inactive, buffers, cached, shared, wired)
+        used = active + wired + cached
+        percent = usage_percent((total - avail), total, round_=1)
+        return svmem(total, avail, percent, used, free,
+                     active, inactive, buffers, cached, shared, wired)
+else:
+    def virtual_memory():
+        """System virtual memory as a namedtuple."""
+        mem = cext.virtual_mem()
+        total, free, active, inactive, wired, cached, buffers, shared = mem
+        avail = inactive + cached + free
+        used = active + wired + cached
+        percent = usage_percent((total - avail), total, round_=1)
+        return svmem(total, avail, percent, used, free,
+                     active, inactive, buffers, cached, shared, wired)
 
 
 def swap_memory():

psutil/arch/netbsd/mem.c

@@ -32,23 +32,25 @@ psutil_virtual_mem(PyObject *self, PyObject *args) {
     struct uvmexp_sysctl uv;
     int mib[] = {CTL_VM, VM_UVMEXP2};
     long pagesize = psutil_getpagesize();
+    unsigned long long available;
 
     size = sizeof(uv);
     if (sysctl(mib, 2, &uv, &size, NULL, 0) < 0) {
         PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
 
-    return Py_BuildValue("KKKKKKKK",
+    // follow zabbix
+    available = uv.inactive + uv.execpages + uv.filepages + uv.free;
+    return Py_BuildValue(
+        "KKKKKKK",
         (unsigned long long) uv.npages << uv.pageshift,  // total
         (unsigned long long) uv.free << uv.pageshift,  // free
         (unsigned long long) uv.active << uv.pageshift,  // active
         (unsigned long long) uv.inactive << uv.pageshift,  // inactive
         (unsigned long long) uv.wired << uv.pageshift,  // wired
         (unsigned long long) (uv.filepages + uv.execpages) * pagesize,  // cached
-        // These are determined from /proc/meminfo in Python.
-        (unsigned long long) 0,  // buffers
-        (unsigned long long) 0  // shared
+        available << uv.pageshift  // available
     );
 }