Fix mem-usage and clarify parameters. Fixes #3

Shinmera · Mar 23, 2020 · 112057c · 112057c
1 parent 739eb6c
commit 112057c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/documentation.lisp b/documentation.lisp
@@ -75,6 +75,9 @@ See VALUE-GENERATOR")
 
 You may specify whether you're interested in swap and cache
 by using the :SWAP and :CACHE initargs respectively.
+When :CACHE is T, memory used by the cache is counted as
+occupied. When :SWAP is T, swap memory and usage are added
+to the total.
 
 This value-generator supplies the following three values:
   0. usage-percentage

diff --git a/generators/mem-usage.lisp b/generators/mem-usage.lisp
@@ -27,15 +27,16 @@
 
 (defmethod compute-value ((generator mem-usage))
   (let* ((meminfo (parse-meminfo))
-         (total (+ (gethash "MemTotal" meminfo)
-                   (if (include-swap generator) (gethash "SwapTotal" meminfo) 0)))
-         (free (gethash "MemFree" meminfo)
-               (gethash "Buffers" meminfo)
-               (if (include-cache generator) 0 (gethash "Cached" meminfo))
-               (if (include-swap generator)
-                   (+ (gethash "SwapFree" meminfo)
-                      (if (include-cache generator) 0 (gethash "SwapCached" meminfo)))
-                   0)))
+         (total (gethash "MemTotal" meminfo))
+         (free (+ (gethash "MemFree" meminfo)
+                  (gethash "Buffers" meminfo))))
+    (unless (include-cache generator)
+      (incf free (gethash "Cached" meminfo)))
+    (when (include-swap generator)
+      (incf total (gethash "SwapTotal" meminfo))
+      (incf free (gethash "SwapFree" meminfo))
+      (unless (include-cache generator)
+        (incf free (gethash "SwapCached" meminfo))))
     (list (float (* 100 (/ (- total free) total)))
           (float (/ total 1024))
           (float (/ free 1024)))))