Module: Mesa Branch: master Commit: fe894dc0b3302330e34f5e53f511569b5a84e2a1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe894dc0b3302330e34f5e53f511569b5a84e2a1
Author: Emmanuel Vadot <[email protected]> Date: Sun Oct 4 11:00:49 2020 +0200 util/os_misc: os_get_available_system_memory() for FreeBSD Based on the OpenBSD variant. The only difference between those two system is the sysctl mib. Signed-off-by: Emmanuel Vadot <[email protected]> Reviewed-by: Matt Turner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6995> --- src/util/os_misc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/os_misc.c b/src/util/os_misc.c index e184edc893d..28a6d1e9806 100644 --- a/src/util/os_misc.c +++ b/src/util/os_misc.c @@ -58,7 +58,7 @@ # include <log/log.h> #elif DETECT_OS_LINUX || DETECT_OS_CYGWIN || DETECT_OS_SOLARIS || DETECT_OS_HURD # include <unistd.h> -#elif DETECT_OS_OPENBSD +#elif DETECT_OS_OPENBSD || DETECT_OS_FREEBSD # include <sys/resource.h> # include <sys/sysctl.h> #elif DETECT_OS_APPLE || DETECT_OS_BSD @@ -213,9 +213,13 @@ os_get_available_system_memory(uint64_t *size) free(meminfo); return false; -#elif DETECT_OS_OPENBSD +#elif DETECT_OS_OPENBSD || DETECT_OS_FREEBSD struct rlimit rl; +#if DETECT_OS_OPENBSD int mib[] = { CTL_HW, HW_USERMEM64 }; +#elif DETECT_OS_FREEBSD + int mib[] = { CTL_HW, HW_USERMEM }; +#endif int64_t mem_available; size_t len = sizeof(mem_available); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
