Unverified Commit 4d7ec21a authored by Philipp Wallisch's avatar Philipp Wallisch Committed by GitHub

Rework macOS memory calculation to work on Apple Silicon (#1752)

parent 19fefa65
...@@ -2601,12 +2601,13 @@ get_memory() { ...@@ -2601,12 +2601,13 @@ get_memory() {
;; ;;
"Mac OS X" | "macOS" | "iPhone OS") "Mac OS X" | "macOS" | "iPhone OS")
hw_pagesize="$(sysctl -n hw.pagesize)"
mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))"
mem_wired="$(vm_stat | awk '/ wired/ { print $4 }')" pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))"
mem_active="$(vm_stat | awk '/ active/ { printf $3 }')" pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')"
mem_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')"
mem_compressed="${mem_compressed:-0}" pages_compressed="${pages_compressed:-0}"
mem_used="$(((${mem_wired//.} + ${mem_active//.} + ${mem_compressed//.}) * 4 / 1024))" mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))"
;; ;;
"BSD" | "MINIX") "BSD" | "MINIX")
......
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