mirror of
https://github.com/TECHNOFAB11/tmux2k.git
synced 2025-12-11 23:50:08 +01:00
fix: show memory percentage
This commit is contained in:
parent
999a55fbb4
commit
f193d0661d
1 changed files with 11 additions and 33 deletions
|
|
@ -8,34 +8,18 @@ source "$current_dir"/utils.sh
|
||||||
get_percent() {
|
get_percent() {
|
||||||
case $(uname -s) in
|
case $(uname -s) in
|
||||||
Linux)
|
Linux)
|
||||||
total_mem_gb=$(free -g | awk '/^Mem/ {print $2}')
|
total_mem=$(free -g | awk '/^Mem/ {print $2}')
|
||||||
used_mem=$(free -g | awk '/^Mem/ {print $3}')
|
used_mem=$(free -g | awk '/^Mem/ {print $3}')
|
||||||
total_mem=$(free -h | awk '/^Mem/ {print $2}')
|
memory_percent=$(awk "BEGIN {printf \"%.2f\", ($used_mem / $total_mem)}")
|
||||||
if (("$total_mem_gb" == 0)); then
|
echo "$memory_percent%"
|
||||||
memory_usage=$(free -m | awk '/^Mem/ {print $3}')
|
|
||||||
total_mem_mb=$(free -m | awk '/^Mem/ {print $2}')
|
|
||||||
echo "$memory_usage"\M\B/"$total_mem_mb"\M\B
|
|
||||||
elif (("$used_mem" == 0)); then
|
|
||||||
memory_usage=$(free -m | awk '/^Mem/ {print $3}')
|
|
||||||
echo "$memory_usage"\M\B/"$total_mem_gb"\G\B
|
|
||||||
else
|
|
||||||
memory_usage=$(free -g | awk '/^Mem/ {print $3}')
|
|
||||||
echo "$memory_usage"\G\B/"$total_mem_gb"\G\B
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
Darwin)
|
Darwin)
|
||||||
# Get used memory blocks with vm_stat, multiply by page size to get size in bytes, then convert to MiB
|
used_mem=$(vm_stat | grep ' active\|wired ' | sed 's/[^0-9]//g' | paste -sd ' ' - | \
|
||||||
used_mem=$(vm_stat | grep ' active\|wired ' | sed 's/[^0-9]//g' | paste -sd ' ' - | awk -v pagesize=$(pagesize) '{printf "%d\n", ($1+$2) * pagesize / 1048576}')
|
awk -v pagesize="$(pagesize)" '{printf "%d\n", ($1+$2) * pagesize / 1048576}')
|
||||||
total_mem=$(system_profiler SPHardwareDataType | grep "Memory:" | awk '{print $2 $3}')
|
total_mem=$(system_profiler SPHardwareDataType | grep "Memory:" | awk '{print $2}')
|
||||||
if (("$used_mem" < 1024)); then
|
memory_percent=$(awk "BEGIN {printf \"%.2f\", ($used_mem / $total_mem / 10)}")
|
||||||
echo "$used_mem"\M\B/"$total_mem"
|
echo "$memory_percent%"
|
||||||
else
|
|
||||||
memory=$(($used_mem / 1024))
|
|
||||||
echo $memory\G\B/$total_mem
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
FreeBSD)
|
FreeBSD)
|
||||||
hw_pagesize="$(sysctl -n hw.pagesize)"
|
hw_pagesize="$(sysctl -n hw.pagesize)"
|
||||||
mem_inactive="$(($(sysctl -n vm.stats.vm.v_inactive_count) * hw_pagesize))"
|
mem_inactive="$(($(sysctl -n vm.stats.vm.v_inactive_count) * hw_pagesize))"
|
||||||
|
|
@ -45,16 +29,10 @@ get_percent() {
|
||||||
free_mem=$(((mem_inactive + mem_unused + mem_cache) / 1024 / 1024))
|
free_mem=$(((mem_inactive + mem_unused + mem_cache) / 1024 / 1024))
|
||||||
total_mem=$(($(sysctl -n hw.physmem) / 1024 / 1024))
|
total_mem=$(($(sysctl -n hw.physmem) / 1024 / 1024))
|
||||||
used_mem=$((total_mem - free_mem))
|
used_mem=$((total_mem - free_mem))
|
||||||
echo $used_mem
|
memory_percent=$(awk "BEGIN {printf \"%.2f\", ($used_mem / $total_mem)}")
|
||||||
if (("$used_mem" < 1024)); then
|
echo "$memory_percent%"
|
||||||
echo $used_mem\M\B/$total_mem
|
|
||||||
else
|
|
||||||
memory=$(($used_mem / 1024))
|
|
||||||
echo $memory\G\B/$total_mem
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
|
CYGWIN* | MINGW32* | MSYS* | MINGW*) ;; # TODO - windows compatibility
|
||||||
CYGWIN* | MINGW32* | MSYS* | MINGW*) ;; # TODO - windows compatability
|
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue