From ffbd8828dc290f7ac58281ea25174f5392605ec0 Mon Sep 17 00:00:00 2001 From: "Sean E. Russell" Date: Tue, 3 Mar 2020 06:36:42 -0600 Subject: Prevent crashes on Windows from wonky CPU values #70 --- devices/cpu_cpu.go | 6 +++++- docs/releasing.md | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devices/cpu_cpu.go b/devices/cpu_cpu.go index a1d20cd..42eff2e 100644 --- a/devices/cpu_cpu.go +++ b/devices/cpu_cpu.go @@ -23,7 +23,11 @@ func init() { } for i := 0; i < len(vals); i++ { key := fmt.Sprintf(formatString, i) - cpus[key] = int(vals[i]) + v := vals[i] + if v > 100 { + v = 100 + } + cpus[key] = int(v) } return nil } diff --git a/docs/releasing.md b/docs/releasing.md index 4c6583c..d77b6dd 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -26,3 +26,10 @@ Nix adds new and interesting complexities to the release. 6. Update the version and hash in nixpkgs/pkgs/tools/system/gotop/default.nix 8. In docker, install & run vgo2nix to update deps.nix 7. nix-build -A gotop + + +For plugin development: +``` +V=$(git show -s --format=%cI HEAD | cut -b -19 | tr -cd '[:digit:]')-$(git rev-parse HEAD | cut -b -12) +go build -ldflags "-X main.Version=$V" -o gotop ./cmd/gotop +``` -- cgit v1.2.3