From 400d9471b647adcff82fa2e35d21deb9a2609322 Mon Sep 17 00:00:00 2001 From: Bradley Cicenas Date: Tue, 13 Jun 2017 20:25:58 +0000 Subject: [PATCH] add pidcount,io to mock collector --- Makefile | 5 +++-- connector/collector/mock.go | 5 +++++ main.go | 12 ++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f529bc0..08fa2bf 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ NAME=ctop VERSION=$(shell cat VERSION) BUILD=$(shell git rev-parse --short HEAD) -LD_FLAGS="-w -X main.version=$(VERSION) -X main.build=$(BUILD) -extldflags=-Wl,--allow-multiple-definition" +EXT_LD_FLAGS="-Wl,--allow-multiple-definition" +LD_FLAGS="-w -X main.version=$(VERSION) -X main.build=$(BUILD) -extldflags=$(EXT_LD_FLAGS)" clean: rm -rf build/ release/ @@ -11,7 +12,7 @@ build: CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o ctop build-dev: - go build -ldflags "-w -X main.version=$(VERSION)-dev -X main.build=$(BUILD)" + go build -ldflags "-w -X main.version=$(VERSION)-dev -X main.build=$(BUILD) -extldflags=$(EXT_LD_FLAGS)" build-all: mkdir -p build diff --git a/connector/collector/mock.go b/connector/collector/mock.go index 9d8dadd..09ada8a 100644 --- a/connector/collector/mock.go +++ b/connector/collector/mock.go @@ -50,6 +50,11 @@ func (c *Mock) run() { rand.Seed(int64(time.Now().Nanosecond())) defer close(c.stream) + // set to random static value, once + c.Pids = rand.Intn(12) + c.IOBytesRead = rand.Int63n(8098) * c.aggression + c.IOBytesWrite = rand.Int63n(8098) * c.aggression + for { c.CPUUtil += rand.Intn(2) * int(c.aggression) if c.CPUUtil >= 100 { diff --git a/main.go b/main.go index 1b01fea..a0dd34e 100644 --- a/main.go +++ b/main.go @@ -77,12 +77,6 @@ func main() { config.Toggle("sortReversed") } - defer Shutdown() - // init grid, cursor, header - cursor = NewGridCursor(*connectorFlag) - cGrid = compact.NewCompactGrid() - header = widgets.NewCTopHeader() - // init ui if *invertFlag { InvertColorMap() @@ -92,6 +86,12 @@ func main() { panic(err) } + defer Shutdown() + // init grid, cursor, header + cursor = NewGridCursor(*connectorFlag) + cGrid = compact.NewCompactGrid() + header = widgets.NewCTopHeader() + for { exit := Display() if exit {