Commit 983968fa authored by Dylan Araps's avatar Dylan Araps Committed by GitHub

Merge pull request #500 from dylanaraps/freebsd_memfix

Memory: [BSD] Rewrite BSD memory function.
parents 8d0b8ac0 242b2bd5
...@@ -1074,21 +1074,28 @@ get_memory() { ...@@ -1074,21 +1074,28 @@ get_memory() {
;; ;;
"BSD") "BSD")
# Mem total
case "$distro" in case "$distro" in
"NetBSD"*) "NetBSD"*) mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))" ;;
memfree="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))" *) mem_total="$(($(sysctl -n hw.physmem) / 1024 / 1024))" ;;
mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))" esac
;;
*) # Mem free
memfree="$(($(vmstat | awk 'END{printf $5}') / 1024))" case "$distro" in
mem_total="$(($(sysctl -n hw.physmem) / 1024 / 1024))" "NetBSD"*) mem_free="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))" ;;
"FreeBSD"* | "DragonFly"*)
mem_free="$(top -d 1 | awk -F ',' '/^Mem:/ {print $5}')"
mem_free="${mem_free/M Free}"
;; ;;
"OpenBSD"*) ;;
*) mem_free="$(($(vmstat | awk 'END{printf $5}') / 1024))" ;;
esac esac
# Mem used
case "$distro" in case "$distro" in
"OpenBSD"*) mem_used="$(($(vmstat | awk 'END {printf $4}') / 1024))" ;; "OpenBSD"*) mem_used="$(($(vmstat | awk 'END{printf $4}') / 1024))" ;;
*) mem_used="$((mem_total - memfree))" ;; *) mem_used="$((mem_total - mem_free))" ;;
esac esac
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment