Merge pull request #13 from AtelierArith/terasaki/issue-9

Resolve Issue 9

Author: terasakisatoshi

Project.toml

@@ -6,6 +6,7 @@ version = "0.1.5"
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Term = "22787eb5-b846-44ae-b979-8e399b8463ab"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 
@@ -25,6 +26,7 @@ JET = "0.9.12"
 MLDataDevices = "1.5.3"
 MacOSIOReport = "0.1.0"
 ReTestItems = "1.29.0"
+Statistics = "1"
 Term = "2.0.6"
 Test = "1"
 UnicodePlots = "3.7.0"

src/TerminalSystemMonitor.jl

@@ -4,6 +4,7 @@ using Dates: Dates, Day, DateTime, Second
 using UnicodePlots
 import Term # this is required by UnicodePlots.panel
 using Term: Consoles
+using Statistics: mean
 using MLDataDevices: MLDataDevices, CUDADevice, CPUDevice, MetalDevice
 
 export monitor # entrypoint from REPL
@@ -79,13 +80,22 @@ function extract_number_and_unit(str::AbstractString)
     end
 end
 
-function plot_cpu_utilization_rates(::Type{CPUDevice})
-    ys = get_cpu_percent()
-    npad = 1 + floor(Int, log10(length(ys)))
-    xs = ["id: $(lpad(i-1, npad))" for (i, _) in enumerate(ys)]
+_relu(x) = max(x, zero(x))
+
+function plot_cpu_utilization_rates(::Type{CPUDevice}, statfn=identity)
+    ys = statfn(get_cpu_percent())
+    if !(ys isa AbstractVector)
+        xs = ["CPU: " * string(statfn)]
+        ys = [ys]
+    else
+        npad = 1 + floor(Int, log10(length(ys)))
+        xs = ["id: $(lpad(i-1, npad))" for (i, _) in enumerate(ys)]
+    end
 
     ncpus = length(ys)
-    ys = round.(ys, digits = 1)
+    # Sometimes `ys`` can be negative, so we need to use relu function so that
+    # it ensures elements in `ys`` are positive.
+    ys = round.(_relu.(ys), digits = 1)
 
     plts = []
 
@@ -136,13 +146,14 @@ function main(dummyargs...)
     # Control cursor hiding and showing with Term.Consoles
     Consoles.hide_cursor()
 
+    statfn = identity
     while true
         try
-            _, cols = displaysize(stdout)
+            rows, cols = displaysize(stdout)
             t1 = @async begin
                 try
                     plts = []
-                    append!(plts, plot_cpu_utilization_rates(CPUDevice))
+                    append!(plts, plot_cpu_utilization_rates(CPUDevice, statfn))
                     n = max(1, cols ÷ 25)
                     chunks = collect(Iterators.partition(plts, n))
                     f = foldl(/, map(c -> prod(UnicodePlots.panel.(c)), chunks))
@@ -226,6 +237,16 @@ function main(dummyargs...)
 
             Consoles.move_to_line(stdout, 1)
             Consoles.cleartoend(stdout)
+            # If user's machine has lots of CPU cores, we can't fit all the plots in one screen.
+            # So we need to use `mean` function to reduce the number of plots.
+            if length(split(string(f), "\n")) > 2rows
+                statfn = mean
+            end
+
+            # If terminal has enough space, we can use `identity` function again to show all the plots.
+            if  rows > 2length(split(string(f), "\n"))
+                statfn = identity
+            end
             display(f)
         catch e
             Consoles.show_cursor()