From 98b72d52df4d59f820cff35f1c53e90b9ac917ca Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Wed, 15 Sep 2021 10:33:37 -0400
Subject: [PATCH 1/4] Use totals (swap and RAM) and adjust to new free output
 format

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
 screen-mem-usage | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/screen-mem-usage b/screen-mem-usage
index 2aa2b4a..a4a9bee 100755
--- a/screen-mem-usage
+++ b/screen-mem-usage
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-total_mem=$(/usr/bin/free -m | /usr/bin/awk '$1 == "Mem:" { print $2 }')
+total_mem=$(/usr/bin/free -tm | /usr/bin/awk '$1 == "Mem:" { print $2 }')
 
 while(true); do
-  current_mem=$(/usr/bin/free -m | /usr/bin/awk '$1 == "-/+" { print $3 }')
+  current_mem=$(/usr/bin/free -tm | /usr/bin/awk '$1 == "Mem:" { print $3 }')
   echo "${current_mem}MB/${total_mem}MB"
   sleep 3
 done

From 8a85b10d9cbee10c9cc76c3015e3ee879efeeded Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Wed, 15 Sep 2021 10:34:43 -0400
Subject: [PATCH 2/4] add a suitable gitignore

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f93ba12
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+CMakeCache.txt
+CMakeFiles/
+Makefile
+cmake_install.cmake
+install_manifest.txt
+screen-cpu-usage

From 414986655729b7067ec04bf5fd37dd010b8bb735 Mon Sep 17 00:00:00 2001
From: "shane.xb.qian" <shane.qian@foxmail.com>
Date: Tue, 11 Oct 2022 16:37:53 +0800
Subject: [PATCH 3/4] feat: adding mem usage percent as well like cpu

* e.g Mem:2961/7987MB 30.0%
* based on pr #2
---
 README.rst       | 2 +-
 screen-mem-usage | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 4cffd19..d1e2206 100644
--- a/README.rst
+++ b/README.rst
@@ -87,7 +87,7 @@ An example configuration::
 
 The example configuration will result in::
 
-  Host:flea   Mem:2961MB/7987MB  Cpu:[||        ]  25.6%  Load:0.64 0.35 0.28 Fri 09/11 12:56am
+  Host:flea   Mem:3130/15344MB 20.3%  Cpu:[||        ]  25.6%  Load:0.64 0.35 0.28 Fri 09/11 12:56am
 
 
 
diff --git a/screen-mem-usage b/screen-mem-usage
index a4a9bee..ca319c7 100755
--- a/screen-mem-usage
+++ b/screen-mem-usage
@@ -4,6 +4,8 @@ total_mem=$(/usr/bin/free -tm | /usr/bin/awk '$1 == "Mem:" { print $2 }')
 
 while(true); do
   current_mem=$(/usr/bin/free -tm | /usr/bin/awk '$1 == "Mem:" { print $3 }')
-  echo "${current_mem}MB/${total_mem}MB"
+  current_mem_pct=$(echo "scale=3; ${current_mem}/${total_mem}" | bc -l)
+  current_mem_pct=$(echo "scale=1; ${current_mem_pct}*100/1" | bc -l)
+  echo "${current_mem}/${total_mem}MB ${current_mem_pct}%"
   sleep 3
 done

From b71511a97caca9ad463aef2f74210db1f745b866 Mon Sep 17 00:00:00 2001
From: "shane.xb.qian" <shane.qian@foxmail.com>
Date: Sun, 23 Oct 2022 20:07:42 +0800
Subject: [PATCH 4/4] feat: better be showing free mem vs used mem

---
 .gitignore       | 1 +
 README.rst       | 8 ++++----
 screen-mem-usage | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f93ba12..6f8fe72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ Makefile
 cmake_install.cmake
 install_manifest.txt
 screen-cpu-usage
+*.swp
diff --git a/README.rst b/README.rst
index d1e2206..437ef15 100644
--- a/README.rst
+++ b/README.rst
@@ -19,12 +19,12 @@ The CPU usage monitor outputs a percent CPU usage over all processors that is
 updated every second.  It also displays a textual bar graph of the current
 percent usage where every '|' character represents 10% usage.  
 
-The memory monitor is updated every three seconds and displays the used and
-available memory.
+The memory monitor is updated every three seconds and displays the free of
+total memory.
 
 Example::
 
-  Mem:2885MB/7987MB  Cpu:[|||||     ]  51.2%
+  Mem:3130/15344MB 79.7%[f]  Cpu:[|||||     ]  51.2%
 
 
 
@@ -87,7 +87,7 @@ An example configuration::
 
 The example configuration will result in::
 
-  Host:flea   Mem:3130/15344MB 20.3%  Cpu:[||        ]  25.6%  Load:0.64 0.35 0.28 Fri 09/11 12:56am
+  Host:flea   Mem:3130/15344MB 79.7%[f]  Cpu:[||        ]  25.6%  Load:0.64 0.35 0.28 Fri 09/11 12:56am
 
 
 
diff --git a/screen-mem-usage b/screen-mem-usage
index ca319c7..7f95e0a 100755
--- a/screen-mem-usage
+++ b/screen-mem-usage
@@ -3,9 +3,9 @@
 total_mem=$(/usr/bin/free -tm | /usr/bin/awk '$1 == "Mem:" { print $2 }')
 
 while(true); do
-  current_mem=$(/usr/bin/free -tm | /usr/bin/awk '$1 == "Mem:" { print $3 }')
-  current_mem_pct=$(echo "scale=3; ${current_mem}/${total_mem}" | bc -l)
-  current_mem_pct=$(echo "scale=1; ${current_mem_pct}*100/1" | bc -l)
-  echo "${current_mem}/${total_mem}MB ${current_mem_pct}%"
+  free_mem=$(/usr/bin/free -tm | /usr/bin/awk '$1 == "Mem:" { print $4 }')
+  free_mem_pct=$(echo "scale=3; ${free_mem}/${total_mem}" | bc -l)
+  free_mem_pct=$(echo "scale=1; ${free_mem_pct}*100/1" | bc -l)
+  echo "${free_mem}/${total_mem}MB ${free_mem_pct}%[f]"
   sleep 3
 done