]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Use HW_PHYSMEM instead of HW_USERMEM in get_total_system_memory_impl
authorKris Katterjohn <katterjohn@gmail.com>
Thu, 3 Jan 2019 23:19:46 +0000 (17:19 -0600)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Jan 2019 19:40:15 +0000 (14:40 -0500)
The code checked for sysctl being available and HW_PHYSMEM being
defined, but HW_USERMEM was actually being used with sysctl instead
of HW_PHYSMEM.

The case for OpenBSD, etc. use HW_PHYSMEM64 (which is obviously a
64-bit variant of HW_PHYSMEM) and the case for OSX uses HW_MEMSIZE
(which appears to be a 64-bit variant of HW_PHYSMEM).

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
src/lib/meminfo/meminfo.c

index 790d69891060dabeb46ce233ea16c214a84043b9..0f536323fa90f755be7e265e5fb71ec5ac5b4251 100644 (file)
@@ -130,7 +130,7 @@ get_total_system_memory_impl(void)
    * HW_PHYSMEM. */
   size_t memsize=0;
   size_t len = sizeof(memsize);
-  int mib[2] = {CTL_HW, HW_USERMEM};
+  int mib[2] = {CTL_HW, HW_PHYSMEM};
   if (sysctl(mib,2,&memsize,&len,NULL,0))
     return 0;