Add support for different size units for MEM metric: K|M|G

Author: samoshkin

scripts/mem.sh

@@ -1,14 +1,12 @@
 #!/usr/bin/env bash
 
-# TODO: add option to choose size unit: M|G
-
 set -u
 set -e
 
 CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "$CURRENT_DIR/helpers.sh"
 
-mem_view_tmpl=$(get_tmux_option "@sysstat_mem_view_tmpl" '#[fg=#{mem.color2}]#{mem.pused}#[default]')
+mem_view_tmpl=$(get_tmux_option "@sysstat_mem_view_tmpl" '#[fg=#{mem.color}]#{mem.pused}#[default]')
 
 mem_stress_threshold=$(get_tmux_option "@sysstat_mem_stress_threshold" "80")
 swap_stress_threshold=$(get_tmux_option "@sysstat_swap_stress_threshold" "80")
@@ -18,6 +16,8 @@ mem_color_stress=$(get_tmux_option "@sysstat_mem_color_stress" "yellow")
 swap_color_ok=$(get_tmux_option "@sysstat_swap_color_ok" "green")
 swap_color_stress=$(get_tmux_option "@sysstat_swap_color_stress" "yellow")
 
+size_unit=$(get_tmux_option "@sysstat_mem_size_unit" "M")
+
 get_mem_color() {
   local mem_pused=$1
 
@@ -40,6 +40,8 @@ get_swap_color(){
 
 print_mem() {
   local mem_usage
+  local scale
+  local size_format
 
   if is_osx; then
     mem_usage=$(get_mem_usage_osx)
@@ -48,39 +50,61 @@ print_mem() {
     mem_usage="TODO"
   fi
 
+  # get_mem_usage* function returns values in KiB
+  # 1 - scale to KiB
+  # 1024 - scale to MiB
+  # 1048576 - scale to GiB
+  case "$size_unit" in 
+    G) scale=1048576;;
+    M) scale=1024;;
+    K) scale=1;;
+  esac
+
+  # Depending on scale factor, change precision
+  # 12612325K - no digits after floating point
+  # 1261M - no digits after floating point
+  # 1.1G  - 1 digit after floating point 
+  case "$size_unit" in 
+    G) size_format='%.1f%s';;
+    M) size_format='%.0f%s';;
+    K) size_format='%.0f%s';;
+  esac
+
   # Extract free and used memory in MiB, calculate total and percentage
-  local mem_free=$(echo $mem_usage | awk '{ print $1/1024 }')
-  local mem_used=$(echo $mem_usage | awk '{ print $2/1024 }')
+  local mem_free=$(echo $mem_usage | awk -v scale="$scale" '{ print $1/scale }')
+  local mem_used=$(echo $mem_usage | awk -v scale="$scale" '{ print $2/scale }')
   local mem_total=$(echo "$mem_free + $mem_used" | calc)
   local mem_pused=$(echo "($mem_used / $mem_total) * 100" | calc)
   local mem_pfree=$(echo "($mem_free / $mem_total) * 100" | calc)
 
   # Extract swap free and used in MiB, calculate total and percentage
-  local swap_free=$(echo $mem_usage | awk '{ print $3/1024 }')
-  local swap_used=$(echo $mem_usage | awk '{ print $4/1024 }')
+  local swap_free=$(echo $mem_usage | awk -v scale="$scale" '{ print $3/scale }')
+  local swap_used=$(echo $mem_usage | awk -v scale="$scale" '{ print $4/scale }')
   local swap_total=$(echo "$swap_free + $swap_used" | calc)
   local swap_pused=$(echo "($swap_used / $swap_total) * 100" | calc)
   local swap_pfree=$(echo "($swap_free / $swap_total) * 100" | calc)
 
   # Calculate colors for mem and swap
   local mem_color=$(get_mem_color "$mem_pused")
   local swap_color=$(get_swap_color "$swap_pused")
+
+  echo $mem_view_tmpl;
 
   local mem_view="$mem_view_tmpl"
-  mem_view="${mem_view//'#{mem.used}'/$(printf "%.0fM" "$mem_used")}"
+  mem_view="${mem_view//'#{mem.used}'/$(printf "$size_format" "$mem_used" "$size_unit")}"
   mem_view="${mem_view//'#{mem.pused}'/$(printf "%.0f%%" "$mem_pused")}"
-  mem_view="${mem_view//'#{mem.free}'/$(printf "%.0fM" "$mem_free")}"
+  mem_view="${mem_view//'#{mem.free}'/$(printf "$size_format" "$mem_free" "$size_unit")}"
   mem_view="${mem_view//'#{mem.pfree}'/$(printf "%.0f%%" "$mem_pfree")}"
-  mem_view="${mem_view//'#{mem.total}'/$(printf "%.0fM" "$mem_total")}"  
+  mem_view="${mem_view//'#{mem.total}'/$(printf "$size_format" "$mem_total" "$size_unit")}"  
   mem_view="${mem_view//'#{mem.color}'/$(echo "$mem_color" | awk '{ print $1 }')}"
   mem_view="${mem_view//'#{mem.color2}'/$(echo "$mem_color" | awk '{ print $2 }')}"
   mem_view="${mem_view//'#{mem.color3}'/$(echo "$mem_color" | awk '{ print $3 }')}"
 
-  mem_view="${mem_view//'#{swap.used}'/$(printf "%.0fM" "$swap_used")}"
+  mem_view="${mem_view//'#{swap.used}'/$(printf "$size_format" "$swap_used" "$size_unit")}"
   mem_view="${mem_view//'#{swap.pused}'/$(printf "%.0f%%" "$swap_pused")}"
-  mem_view="${mem_view//'#{swap.free}'/$(printf "%.0fM" "$swap_free")}"
+  mem_view="${mem_view//'#{swap.free}'/$(printf "$size_format" "$swap_free" "$size_unit")}"
   mem_view="${mem_view//'#{swap.pfree}'/$(printf "%.0f%%" "$swap_pfree")}"
-  mem_view="${mem_view//'#{swap.total}'/$(printf "%.0fM" "$swap_total")}"
+  mem_view="${mem_view//'#{swap.total}'/$(printf "$size_format" "$swap_total" "$size_unit")}"
   mem_view="${mem_view//'#{swap.color}'/$(echo "$swap_color" | awk '{ print $1 }')}"
   mem_view="${mem_view//'#{swap.color2}'/$(echo "$swap_color" | awk '{ print $2 }')}"
   mem_view="${mem_view//'#{swap.color3}'/$(echo "$swap_color" | awk '{ print $3 }')}"