mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-09-19 03:51:22 +02:00
speed up ram and swap prompts
This commit is contained in:
romkatv
parent
3e3da88dbc
commit
b92d510882
2 changed files with 52 additions and 62 deletions
|
|
@ -45,34 +45,18 @@ function _p9k_g_expand() {
|
|||
typeset -g $1=${(g::)${(P)1}}
|
||||
}
|
||||
|
||||
# Converts large memory values into a human-readable unit (e.g., bytes --> GB)
|
||||
# Takes two arguments:
|
||||
# * $size - The number which should be prettified
|
||||
# * $base - The base of the number (default Bytes)
|
||||
printSizeHumanReadable() {
|
||||
typeset -F 2 size
|
||||
size="$1"+0.00001
|
||||
local extension
|
||||
extension=('B' 'K' 'M' 'G' 'T' 'P' 'E' 'Z' 'Y')
|
||||
local index=1
|
||||
typeset -g _P9K_BYTE_SUFFIX=('B' 'K' 'M' 'G' 'T' 'P' 'E' 'Z' 'Y')
|
||||
|
||||
# if the base is not Bytes
|
||||
if [[ -n $2 ]]; then
|
||||
local idx
|
||||
for idx in "${extension[@]}"; do
|
||||
if [[ "$2" == "$idx" ]]; then
|
||||
break
|
||||
fi
|
||||
index=$(( index + 1 ))
|
||||
done
|
||||
fi
|
||||
|
||||
while (( (size / 1024) > 0.1 )); do
|
||||
size=$(( size / 1024 ))
|
||||
index=$(( index + 1 ))
|
||||
# 42 => 42B
|
||||
# 1536 => 1.5K
|
||||
function _p9k_human_readable_bytes() {
|
||||
typeset -F 2 n=$1
|
||||
local suf
|
||||
for suf in $_P9K_BYTE_SUFFIX; do
|
||||
(( n < 100 )) && break
|
||||
(( n /= 1024 ))
|
||||
done
|
||||
|
||||
echo "$size${extension[$index]}"
|
||||
_P9K_RETVAL=$n$suf
|
||||
}
|
||||
|
||||
# Determine if the passed segment is used in the prompt
|
||||
|
|
|
|||
|
|
@ -1279,26 +1279,30 @@ prompt_php_version() {
|
|||
################################################################
|
||||
# Segment to display free RAM and used Swap
|
||||
prompt_ram() {
|
||||
local ROOT_PREFIX="${4}"
|
||||
local base=''
|
||||
local ramfree=0
|
||||
if [[ "$OS" == "OSX" ]]; then
|
||||
# Available = Free + Inactive
|
||||
# See https://support.apple.com/en-us/HT201538
|
||||
ramfree=$(vm_stat | grep "Pages free" | grep -o -E '[0-9]+')
|
||||
ramfree=$((ramfree + $(vm_stat | grep "Pages inactive" | grep -o -E '[0-9]+')))
|
||||
# Convert pages into Bytes
|
||||
ramfree=$(( ramfree * 4096 ))
|
||||
else
|
||||
if [[ "$OS" == "BSD" ]]; then
|
||||
ramfree=$(grep 'avail memory' ${ROOT_PREFIX}/var/run/dmesg.boot | awk '{print $4}')
|
||||
else
|
||||
ramfree=$(grep -o -E "MemAvailable:\s+[0-9]+" ${ROOT_PREFIX}/proc/meminfo | grep -o -E "[0-9]+")
|
||||
base='K'
|
||||
fi
|
||||
fi
|
||||
local -F free_bytes
|
||||
|
||||
"$1_prompt_segment" "$0" "$2" "yellow" "$DEFAULT_COLOR" 'RAM_ICON' 0 '' "$(printSizeHumanReadable "$ramfree" $base)"
|
||||
case $OS in
|
||||
OSX)
|
||||
(( $+commands[vm_stat] )) || return
|
||||
local stat && stat=$(command vm_stat 2>/dev/null) || return
|
||||
[[ $stat =~ 'Pages free:[[:space:]]+([0-9]+)' ]] || return
|
||||
(( free_bytes+=match[1] ))
|
||||
[[ $stat =~ 'Pages inactive:[[:space:]]+([0-9]+)' ]] || return
|
||||
(( free_bytes+=match[1] ))
|
||||
(( free_bytes *= 4096 ))
|
||||
;;
|
||||
BSD)
|
||||
local stat && stat=$(command grep -F 'avail memory' /var/run/dmesg.boot 2>/dev/null) || return
|
||||
free_bytes=${${(A)=stat}[4]}
|
||||
;;
|
||||
*)
|
||||
local stat && stat=$(command grep -F MemAvailable /proc/meminfo 2>/dev/null) || return
|
||||
free_bytes=$(( ${${(A)=stat}[2]} * 1024 ))
|
||||
;;
|
||||
esac
|
||||
|
||||
_p9k_human_readable_bytes $free_bytes
|
||||
$1_prompt_segment $0 $2 yellow "$DEFAULT_COLOR" RAM_ICON 0 '' $_P9K_RETVAL
|
||||
}
|
||||
|
||||
function _p9k_read_rbenv_version_file() {
|
||||
|
|
@ -1505,28 +1509,30 @@ prompt_status() {
|
|||
################################################################
|
||||
# Segment to display Swap information
|
||||
prompt_swap() {
|
||||
local ROOT_PREFIX="${4}"
|
||||
local swap_used=0
|
||||
local base=''
|
||||
local -F used_bytes
|
||||
|
||||
if [[ "$OS" == "OSX" ]]; then
|
||||
local raw_swap_used
|
||||
raw_swap_used=$(sysctl vm.swapusage | grep -o "used\s*=\s*[0-9,.A-Z]*" | grep -o "[0-9,.A-Z]*$")
|
||||
|
||||
typeset -F 2 swap_used
|
||||
swap_used=${$(echo $raw_swap_used | grep -o "[0-9,.]*")//,/.}
|
||||
# Replace comma
|
||||
swap_used=${swap_used//,/.}
|
||||
|
||||
base=$(echo "$raw_swap_used" | grep -o "[A-Z]*$")
|
||||
(( $+commands[sysctl] )) || return
|
||||
[[ "$(sysctl vm.swapusage)" =~ "used = ([0-9,.]+)([A-Z]+)" ]] || return
|
||||
used_bytes=${match[1]//,/.}
|
||||
case ${match[2]} in
|
||||
K) (( used_bytes *= 1024 ));;
|
||||
M) (( used_bytes *= 1048576 ));;
|
||||
G) (( used_bytes *= 1073741824 ));;
|
||||
T) (( used_bytes *= 1099511627776 ));;
|
||||
*) return;;
|
||||
esac
|
||||
else
|
||||
swap_total=$(grep -o -E "SwapTotal:\s+[0-9]+" ${ROOT_PREFIX}/proc/meminfo | grep -o -E "[0-9]+")
|
||||
swap_free=$(grep -o -E "SwapFree:\s+[0-9]+" ${ROOT_PREFIX}/proc/meminfo | grep -o -E "[0-9]+")
|
||||
swap_used=$(( swap_total - swap_free ))
|
||||
base='K'
|
||||
local meminfo && meminfo=$(command grep -F 'Swap' /proc/meminfo) || return
|
||||
[[ $meminfo =~ 'SwapTotal:[[:space:]]+([0-9]+)' ]] || return
|
||||
(( used_bytes+=match[1] ))
|
||||
[[ $meminfo =~ 'SwapFree:[[:space:]]+([0-9]+)' ]] || return
|
||||
(( used_bytes-=match[1] ))
|
||||
(( used_bytes *= 1024 ))
|
||||
fi
|
||||
|
||||
"$1_prompt_segment" "$0" "$2" "yellow" "$DEFAULT_COLOR" 'SWAP_ICON' 0 '' "$(printSizeHumanReadable "$swap_used" $base)"
|
||||
_p9k_human_readable_bytes $used_bytes
|
||||
$1_prompt_segment $0 $2 yellow "$DEFAULT_COLOR" SWAP_ICON 0 '' $_P9K_RETVAL
|
||||
}
|
||||
|
||||
################################################################
|
||||
|
|
|
|||
Loading…
Reference in a new issue