FreeBSD: fix total memory

giampaolo · Dec 17, 2015 · bd9a58b · bd9a58b
1 parent 24f7b2e
commit bd9a58b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,6 +1,6 @@
 Bug tracker at https://github.com/giampaolo/psutil/issues
 
-3.3.1 - XXXX-XX-XX
+3.4.0 - XXXX-XX-XX
 ==================
 
 **Enhancements**
@@ -15,6 +15,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
 - #714: [OpenBSD] virtual_memory().cached value was always set to 0.
 - #715: don't crash at import time if cpu_times() fail for some reason.
 - #717: [Linux] Process.open_files fails if deleted files still visible.
+- #724: [FreeBSD] virtual_memory().total is slightly incorrect.
 
 
 3.3.0 - 2015-11-25

diff --git a/psutil/__init__.py b/psutil/__init__.py
@@ -162,7 +162,7 @@
 ]
 __all__.extend(_psplatform.__extra__all__)
 __author__ = "Giampaolo Rodola'"
-__version__ = "3.3.1"
+__version__ = "3.4.0"
 version_info = tuple([int(num) for num in __version__.split('.')])
 AF_LINK = _psplatform.AF_LINK
 _TOTAL_PHYMEM = None

diff --git a/psutil/arch/bsd/freebsd.c b/psutil/arch/bsd/freebsd.c
@@ -485,7 +485,7 @@ psutil_virtual_mem(PyObject *self, PyObject *args) {
 #endif
     size_t buffers_size = sizeof(buffers);
 
-    if (sysctlbyname("vm.stats.vm.v_page_count", &total, &size, NULL, 0))
+    if (sysctlbyname("hw.physmem", &total, &size, NULL, 0))
         goto error;
     if (sysctlbyname("vm.stats.vm.v_active_count", &active, &size, NULL, 0))
         goto error;
@@ -506,7 +506,7 @@ psutil_virtual_mem(PyObject *self, PyObject *args) {
         goto error;
 
     return Py_BuildValue("KKKKKKKK",
-        (unsigned long long) total    * pagesize,
+        (unsigned long long) total,
         (unsigned long long) free     * pagesize,
         (unsigned long long) active   * pagesize,
         (unsigned long long) inactive * pagesize,