Update

Author: terasakisatoshi

Project.toml

@@ -11,15 +11,11 @@ UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 
 [weakdeps]
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
-Metal = "dde4c033-4e86-420c-a63e-0dd931031962"
 MacOSIOReport = "27799fc1-e272-4181-9793-a9e1fcba685b"
 
 [extensions]
 TerminalSystemMonitorCUDAExt = "CUDA"
-TerminalSystemMonitorMetalExt = ["Metal"]
-
-[sources]
-MacOSIOReport = {url = "https://github.com/AtelierArith/MacOSIOReport.jl", rev="main"}
+TerminalSystemMonitorMacOSIOReportExt = "MacOSIOReport"
 
 [compat]
 Aqua = "0.8.9"
@@ -28,15 +24,13 @@ Dates = "1"
 JET = "0.9.12"
 MLDataDevices = "1.5.3"
 MacOSIOReport = "0.1.0"
-Metal = "1.5.1"
 ReTestItems = "1.29.0"
 Term = "2.0.6"
 Test = "1"
 UnicodePlots = "3.7.0"
 julia = "1.10"
 
 [extras]
-MacOSIOReport = "27799fc1-e272-4181-9793-a9e1fcba685b"
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"

ext/TerminalSystemMonitorMetalExt/TerminalSystemMonitorMetalExt.jl renamed to ext/TerminalSystemMonitorMacOSIOReportExt/TerminalSystemMonitorMacOSIOReportExt.jl

@@ -1,10 +1,9 @@
-module TerminalSystemMonitorMetalExt
+module TerminalSystemMonitorMacOSIOReportExt
 
 using MLDataDevices: MetalDevice
 using UnicodePlots: barplot
 import TerminalSystemMonitor
-using Metal: MTLDevice
-using MacOSIOReport: Sampler, get_metrics
+using MacOSIOReport: Sampler, get_metrics, MTLDevice
 using TerminalSystemMonitor: extract_number_and_unit
 
 function _plot_cpu_utilization_rates(id, usage)
@@ -40,4 +39,4 @@ function TerminalSystemMonitor.plot_gpu_utilization_rates(::Type{MetalDevice})
     return plts
 end
 
-end # module TerminalSystemMonitorCUDAExt
+end # module TerminalSystemMonitorMacOSIOReportExt

src/TerminalSystemMonitor.jl

@@ -143,14 +143,22 @@ function main(dummyargs...)
         try
             _, cols = displaysize(stdout)
             t1 = @async begin
-                plts = []
-                append!(plts, plot_cpu_utilization_rates(CPUDevice))
-                n = max(1, cols ÷ 25)
-                chunks = collect(Iterators.partition(plts, n))
-                f = foldl(/, map(c -> prod(UnicodePlots.panel.(c)), chunks))
-
-                f /= prod(UnicodePlots.panel.(plot_cpu_memory_utilization(CPUDevice)))
-                f
+                try
+                    plts = []
+                    append!(plts, plot_cpu_utilization_rates(CPUDevice))
+                    n = max(1, cols ÷ 25)
+                    chunks = collect(Iterators.partition(plts, n))
+                    f = foldl(/, map(c -> prod(UnicodePlots.panel.(c)), chunks))
+
+                    f /= prod(UnicodePlots.panel.(plot_cpu_memory_utilization(CPUDevice)))
+                    return f
+                catch e
+                    if e isa InterruptException
+                        return nothing
+                    else
+                        rethrow(e)
+                    end
+                end
             end
 
             if isdefined(Main, :CUDA) &&
@@ -167,16 +175,39 @@ function main(dummyargs...)
                 end
                 gpuchunks = collect(Iterators.partition(cudaplts, n))
                 f /= foldl(/, map(c -> prod(UnicodePlots.panel.(c)), gpuchunks))
-            elseif isdefined(Main, :Metal) && Sys.isapple() && Sys.ARCH == :aarch64
+            elseif isdefined(Main, :MacOSIOReport) && Sys.isapple() && Sys.ARCH == :aarch64
                 metalplts = []
                 n = max(1, cols ÷ 50)
-                t2 = @async plot_cpu_utilization_rates(MetalDevice)
-                t3 = @async plot_gpu_utilization_rates(MetalDevice)
+                t2 = @async begin
+                    try
+                        return plot_cpu_utilization_rates(MetalDevice)
+                    catch e
+                        if e isa InterruptException
+                            return nothing
+                        else
+                            rethrow(e)
+                        end
+                    end
+                end
+                t3 = @async begin
+                    try
+                        return plot_gpu_utilization_rates(MetalDevice)
+                    catch e
+                        if e isa InterruptException
+                            return nothing
+                        else
+                            rethrow(e)
+                        end
+                    end
+                end
                 wait(t1)
                 wait(t2)
                 wait(t3)
                 plts1 = fetch(t2)
                 plts2 = fetch(t3)
+                if isnothing(plts1) || isnothing(plts2)
+                    break
+                end
                 for i in eachindex(plts1)
                     push!(metalplts, plts1[i])
                 end
@@ -188,21 +219,18 @@ function main(dummyargs...)
             else
                 wait(t1)
                 f = fetch(t1)
+                if isnothing(f)
+                    break
+                end
             end
             clearlinesall()
             display(f)
         catch e
             unhidecursor() # unhide cursor
-            if e isa InterruptException || e isa TaskFailedException
-                @info "Intrrupted"
-                break
-            else
-                @warn "Got Exception"
-                rethrow(e) # so we don't swallow true exceptions
-            end
+            @warn "Got Exception"
+            rethrow(e) # so we don't swallow true exceptions
         end
     end
-    @info "Unhide cursor"
     unhidecursor() # unhide cursor
 end