Merge pull request #54 from ReagentX/master

Fix #53: report MacOS memory correctly
This commit is contained in:
Dane Williams 2020-08-01 16:38:43 -07:00 committed by GitHub
commit 4f3bf8a9be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -18,7 +18,8 @@ get_percent()
Darwin) Darwin)
# percent=$(ps -A -o %mem | awk '{mem += $1} END {print mem}') # percent=$(ps -A -o %mem | awk '{mem += $1} END {print mem}')
used_mem=$(top -l 1 -s 0 | grep PhysMem | sed 's/[a-z]//g; s/[A-Z]//g; s/[()]//g' | awk '{printf "%d\n", $2-$3-$5}') # Get used memory blocks with vm_stat, multiply by 4096 to get size in bytes, then convert to MiB
used_mem=$(vm_stat | grep ' active\|wired ' | sed 's/[^0-9]//g' | paste -sd ' ' - | awk '{printf "%d\n", ($1+$2) * 4096 / 1048576}')
total_mem=$(system_profiler SPHardwareDataType | grep "Memory:" | awk '{print $2 $3}') total_mem=$(system_profiler SPHardwareDataType | grep "Memory:" | awk '{print $2 $3}')
if (( $used_mem < 1024 )); then if (( $used_mem < 1024 )); then
echo $used_mem\M\B/$total_mem echo $used_mem\M\B/$total_mem