#557 / NetBSD: fix total virt mem

giampaolo · Jan 11, 2016 · f81770f · f81770f
1 parent bcb0c84
commit f81770f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/psutil/arch/bsd/netbsd.c b/psutil/arch/bsd/netbsd.c
@@ -424,20 +424,27 @@ psutil_get_cmdline(pid_t pid) {
 
 PyObject *
 psutil_virtual_mem(PyObject *self, PyObject *args) {
-    unsigned int total;
-    size_t size = sizeof(total);
+    int64_t total_physmem;
+    size_t size;
     struct uvmexp_sysctl uv;
-    int mib[] = {CTL_VM, VM_UVMEXP2};
+    int physmem_mib[] = {CTL_HW, HW_PHYSMEM64};
+    int uvmexp_mib[] = {CTL_VM, VM_UVMEXP2};
     long pagesize = getpagesize();
-    size = sizeof(uv);
 
-    if (sysctl(mib, 2, &uv, &size, NULL, 0) < 0) {
+    size = sizeof(total_physmem);
+    if (sysctl(physmem_mib, 2, &total_physmem, &size, NULL, 0) < 0) {
+        PyErr_SetFromErrno(PyExc_OSError);
+        return NULL;
+    }
+
+    size = sizeof(uv);
+    if (sysctl(uvmexp_mib, 2, &uv, &size, NULL, 0) < 0) {
         PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
 
     return Py_BuildValue("KKKKKKKK",
-        (unsigned long long) uv.npages * pagesize,  // total
+        (unsigned long long) total_physmem,  // total
         (unsigned long long) uv.free * pagesize,  // free
         (unsigned long long) uv.active * pagesize,  // active
         (unsigned long long) uv.inactive * pagesize,  // inactive

diff --git a/test/_bsd.py b/test/_bsd.py
@@ -22,6 +22,7 @@
 from test_psutil import FREEBSD
 from test_psutil import get_test_subprocess
 from test_psutil import MEMORY_TOLERANCE
+from test_psutil import NETBSD
 from test_psutil import OPENBSD
 from test_psutil import reap_children
 from test_psutil import retry_before_failing
@@ -44,7 +45,7 @@ def sysctl(cmdline):
     result = sh("sysctl " + cmdline)
     if FREEBSD:
         result = result[result.find(": ") + 2:]
-    elif OPENBSD:
+    elif OPENBSD or NETBSD:
         result = result[result.find("=") + 1:]
     try:
         return int(result)
@@ -292,13 +293,25 @@ def test_boot_time(self):
         self.assertEqual(sys_bt, psutil_bt)
 
 
+# =====================================================================
+# --- NetBSD
+# =====================================================================
+
+
+@unittest.skipUnless(NETBSD, "not an NetBSD system")
+class NetBSDSpecificTestCase(unittest.TestCase):
+    pass
+
+
 def main():
     test_suite = unittest.TestSuite()
     test_suite.addTest(unittest.makeSuite(BSDSpecificTestCase))
     if FREEBSD:
         test_suite.addTest(unittest.makeSuite(FreeBSDSpecificTestCase))
     elif OPENBSD:
         test_suite.addTest(unittest.makeSuite(OpenBSDSpecificTestCase))
+    elif NETBSD:
+        test_suite.addTest(unittest.makeSuite(NetBSDSpecificTestCase))
     result = unittest.TextTestRunner(verbosity=2).run(test_suite)
     return result.wasSuccessful()
 

diff --git a/test/test_psutil.py b/test/test_psutil.py
@@ -3248,6 +3248,9 @@ def main():
         elif OPENBSD:
             from _bsd import OpenBSDSpecificTestCase
             tests.append(OpenBSDSpecificTestCase)
+        elif NETBSD:
+            from _bsd import NetBSDSpecificTestCase
+            tests.append(NetBSDSpecificTestCase)
 
     if stc is not None:
         tests.append(stc)