perfmonger 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 238da9d952389a0d84f3e619631bb907d604b98a
-  data.tar.gz: 982086728c90cd798a1ae0316af2cb1e23c87370
+SHA256:
+  metadata.gz: 4a60a8aaed2af9077a0027baf15afc68856ed6c5d9a08267dde6a903abeea762
+  data.tar.gz: 46113a4949d34a74737acac64f8d032b31cf3bddfdad51dbc158fc0599fa1151
 SHA512:
-  metadata.gz: 77b4709a0399f3c3725488b5005ee27028eb5231ae1dc8523c5dc24a92c4adfd8db92e65eba696de7533712e2817923f87edb3582df468fc02b340b1819d5dd9
-  data.tar.gz: 4fffefe769a436e2456f57c4bef540dbd95f0c4a43d92b392c913c7f472bb8ae7b2d4c8f5f8275f29fe5b89a2576969fe25f5266d8546e45ccfc3289bfd9dbfa
+  metadata.gz: 4eacfdf595f3bd39bc64f5516ef8d14eff0a49e9f8befdf7a2102b642dd604be88328783fceb7a1b3163a883554eb624d1b46e88a3a13c23b9265ef0a4b1343c
+  data.tar.gz: 1b416767ae0201a1cbb7f500c99f14c88566a86c7a8e03c5f0d56a3b1ba0ba8b12b5491a0a5ac35d2b06263b6af5fbd6b22e7550df8720bd78a183e8c4b68eae

data/.travis.yml

@@ -11,16 +11,13 @@ install:
   - export GOPATH="$HOME/go"
   - export PATH="$PATH:$GOPATH/bin"
   - mkdir -p "$HOME/go/{src,pkg,bin}"
-  - go get -u github.com/mattn/go-isatty
-  - go get -u github.com/hayamiz/go-projson
-  - go get -u golang.org/x/crypto/ssh/terminal
-  - go get -u github.com/hayamiz/perfmonger/core/subsystem
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
 script:
+  - rake go_get
   - rake spec
   - rake test_core
 notifications:

data/NEWS

@@ -1,3 +1,10 @@
+## 20XX-XX-XX: PerfMonger 0.12.0
+
+## 2020-03-31: PerfMonger 0.11.2
+  * Bug fixes
+    * [plot] subcommand:
+      * Remove temporary directory correctly
+
 ## 2018-05-15: PerfMonger 0.11.1
   * Bug fixes
     * [record] subcommand:

data/README.md

@@ -26,7 +26,7 @@ You need gnuplot 4.6.0 or later build with cairo terminals for plotting measurem
 
 ### Build from source
 
-You need Ruby 1.9.3 or later, and Go 1.8 or later to build perfmonger.
+You need Ruby 2.2 or later, and Go 1.8 or later to build perfmonger.
 
     bundle
     rake build

data/Rakefile

@@ -26,6 +26,8 @@ task :go_get do
   sh "go get -u github.com/hayamiz/perfmonger/core/subsystem"
   sh "go get -u golang.org/x/crypto/ssh/terminal"
   sh "go get -u github.com/mattn/go-isatty"
+  sh "go get -u github.com/nsf/termbox-go"
+  sh "go get -u github.com/jroimartin/gocui"
 end
 
 desc "Run tests of core recorder/player"

data/core/Makefile

@@ -17,6 +17,10 @@ all: build
 	go build -o $@ perfmonger-player.go $(GO_SRC)
 
 
+../lib/exec/perfmonger-viewer_linux_amd64: perfmonger-viewer.go $(GO_DEPS)
+	go build -o $@ perfmonger-viewer.go $(GO_SRC)
+
+
 ../lib/exec/perfmonger-summarizer_linux_amd64: perfmonger-summarizer.go $(GO_DEPS)
 	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
 
@@ -33,6 +37,10 @@ all: build
 	go build -o $@ perfmonger-player.go $(GO_SRC)
 
 
+../lib/exec/perfmonger-viewer_darwin_amd64: perfmonger-viewer.go $(GO_DEPS)
+	go build -o $@ perfmonger-viewer.go $(GO_SRC)
+
+
 ../lib/exec/perfmonger-summarizer_darwin_amd64: perfmonger-summarizer.go $(GO_DEPS)
 	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
 
@@ -41,8 +49,8 @@ all: build
 	go build -o $@ perfmonger-plot-formatter.go $(GO_SRC)
 
 
-build: ../lib/exec/perfmonger-recorder_linux_amd64 ../lib/exec/perfmonger-player_linux_amd64 ../lib/exec/perfmonger-summarizer_linux_amd64 ../lib/exec/perfmonger-plot-formatter_linux_amd64 ../lib/exec/perfmonger-recorder_darwin_amd64 ../lib/exec/perfmonger-player_darwin_amd64 ../lib/exec/perfmonger-summarizer_darwin_amd64 ../lib/exec/perfmonger-plot-formatter_darwin_amd64
+build: ../lib/exec/perfmonger-recorder_linux_amd64 ../lib/exec/perfmonger-player_linux_amd64 ../lib/exec/perfmonger-viewer_linux_amd64 ../lib/exec/perfmonger-summarizer_linux_amd64 ../lib/exec/perfmonger-plot-formatter_linux_amd64 ../lib/exec/perfmonger-recorder_darwin_amd64 ../lib/exec/perfmonger-player_darwin_amd64 ../lib/exec/perfmonger-viewer_darwin_amd64 ../lib/exec/perfmonger-summarizer_darwin_amd64 ../lib/exec/perfmonger-plot-formatter_darwin_amd64
 
 clean:
-	rm -f ../lib/exec/perfmonger-recorder_linux_amd64 ../lib/exec/perfmonger-player_linux_amd64 ../lib/exec/perfmonger-summarizer_linux_amd64 ../lib/exec/perfmonger-plot-formatter_linux_amd64 ../lib/exec/perfmonger-recorder_darwin_amd64 ../lib/exec/perfmonger-player_darwin_amd64 ../lib/exec/perfmonger-summarizer_darwin_amd64 ../lib/exec/perfmonger-plot-formatter_darwin_amd64
+	rm -f ../lib/exec/perfmonger-recorder_linux_amd64 ../lib/exec/perfmonger-player_linux_amd64 ../lib/exec/perfmonger-viewer_linux_amd64 ../lib/exec/perfmonger-summarizer_linux_amd64 ../lib/exec/perfmonger-plot-formatter_linux_amd64 ../lib/exec/perfmonger-recorder_darwin_amd64 ../lib/exec/perfmonger-player_darwin_amd64 ../lib/exec/perfmonger-viewer_darwin_amd64 ../lib/exec/perfmonger-summarizer_darwin_amd64 ../lib/exec/perfmonger-plot-formatter_darwin_amd64
 

data/core/build.sh

@@ -57,7 +57,7 @@ for idx in $(seq 0 $((${#TARGET[@]}-1))); do
     export var_GOOS=$1
     export var_GOARCH=$2
 
-    for subcmd in recorder player summarizer plot-formatter; do
+    for subcmd in recorder player viewer summarizer plot-formatter; do
         TARGETS+=(../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH})
 
         cat <<EOF >> $makefile

data/core/perfmonger-viewer.go

@@ -0,0 +1,164 @@
+//usr/bin/env go run $0 $@ ; exit
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"math"
+	"math/rand"
+	"time"
+
+	gocui "github.com/jroimartin/gocui"
+	termbox "github.com/nsf/termbox-go"
+)
+
+func main() {
+	g, err := gocui.NewGui(gocui.OutputNormal)
+	if err != nil {
+		log.Panicln(err)
+	}
+	defer g.Close()
+
+	g.SetManagerFunc(layout)
+
+	setupKeybind(g)
+
+	go func() {
+		for {
+			time.Sleep(1 * time.Second)
+			g.Update(layout)
+		}
+	}()
+
+	if err := g.MainLoop(); err != nil && err != gocui.ErrQuit {
+		log.Panicln(err)
+	}
+}
+
+func setupKeybind(g *gocui.Gui) {
+	if err := g.SetKeybinding("", gocui.KeyCtrlC, gocui.ModNone, quit); err != nil {
+		log.Panicln(err)
+	}
+
+	if err := g.SetKeybinding("", 'c', gocui.ModNone, changeColor); err != nil {
+		log.Panicln(err)
+	}
+
+	if err := g.SetKeybinding("", 'q', gocui.ModNone, quit); err != nil {
+		log.Panicln(err)
+	}
+}
+
+var colmode bool = false
+
+func changeColor(g *gocui.Gui, v *gocui.View) error {
+	if colmode {
+		colmode = false
+	} else {
+		colmode = true
+	}
+	return nil
+}
+
+// Vertical bar characters
+// ' ': \u0020
+// '▁': \u2581
+// '▂': \u2582
+// '▃': \u2583
+// '▄': \u2584
+// '▅': \u2585
+// '▆': \u2586
+// '▇': \u2587
+// '█': \u2588
+var vbar_runes []rune = []rune(" ▁▂▃▄▅▆▇█")
+
+func drawPercent(g *gocui.Gui, x int, y int, height int, pct float64, fg, bg termbox.Attribute) {
+	pct = math.Max(0.0, math.Min(100.0, pct))
+	pct_ndiv := 9
+	if height > 1 {
+		pct_ndiv += 8 * (height - 1)
+	}
+	pct_class := int(pct / (100.0 / float64(pct_ndiv)))
+
+	col := termbox.ColorBlue
+	if 25 <= pct && pct < 50 {
+		col = termbox.ColorGreen
+	} else if 50 <= pct && pct < 75 {
+		col = termbox.ColorYellow
+	} else if 75 <= pct {
+		col = termbox.ColorRed
+	}
+
+	if !colmode {
+		col = termbox.ColorWhite
+	}
+
+	for cell_pos := height - 1; cell_pos >= 0; cell_pos-- {
+		vbar_idx := intMin(pct_class, len(vbar_runes)-1)
+		termbox.SetCell(x, y+cell_pos, vbar_runes[vbar_idx], col, bg)
+		pct_class -= vbar_idx
+	}
+
+	// termbox.SetCell(x, y, vbar_runes[pct_class], fg, bg)
+}
+
+func drawRunes(g *gocui.Gui, x int, y int, runes []rune) {
+	for _, r := range runes {
+		termbox.SetCell(x, y, r, termbox.ColorDefault, termbox.ColorDefault)
+		x += 1
+	}
+}
+
+func intMin(x, y int) int {
+	if x > y {
+		return y
+	} else {
+		return x
+	}
+}
+
+var start_time int64 = time.Now().Unix()
+
+func layout(g *gocui.Gui) error {
+	// maxX, maxY := g.Size()
+	// if v, err := g.SetView("hello", maxX/2-7, maxY/2, maxX/2+7, maxY/2+2); err != nil {
+	// 	if err != gocui.ErrUnknownView {
+	// 		return err
+	// 	}
+	// 	fmt.Fprintln(v, "Hello world!")
+	// }
+
+	for coreid := 0; coreid < 8; coreid++ {
+		s := int64(coreid + 1)
+		rand.Seed(s)
+
+		inc := int(time.Now().Unix() - start_time)
+		for i := 0; i < inc; i++ {
+			rand.Float64()
+		}
+
+		for i := 0; i < 100; i++ {
+			// drawPercent(g, i+5, 1+coreid*5, 4, float64(i)/2.0, termbox.ColorDefault, termbox.ColorDefault)
+			drawPercent(g, i+6, 1+coreid*5, 4, rand.Float64()*100, termbox.ColorDefault, termbox.ColorDefault)
+
+			ch := '-'
+			if (i+inc)%10 == 0 {
+				ch = '+'
+			}
+			termbox.SetCell(i+6, 1+coreid*5+4, ch, termbox.ColorDefault, termbox.ColorDefault)
+		}
+		drawRunes(g, 0, 1+coreid*5, []rune(fmt.Sprintf("core%d", coreid)))
+
+		drawRunes(g, 100+6+1, 1+coreid*5, []rune(fmt.Sprintf("%%usr: % 2.1f", rand.Float64()*30)))
+		drawRunes(g, 100+6+1, 1+coreid*5+1, []rune(fmt.Sprintf("%%sys: % 2.1f", rand.Float64()*30)))
+		drawRunes(g, 100+6+1, 1+coreid*5+2, []rune(fmt.Sprintf("%%iow: % 2.1f", rand.Float64()*30)))
+		drawRunes(g, 100+6+1, 1+coreid*5+3, []rune(fmt.Sprintf("%%oth: % 2.1f", rand.Float64()*30)))
+	}
+
+	return nil
+}
+
+func quit(g *gocui.Gui, v *gocui.View) error {
+	return gocui.ErrQuit
+}

data/lib/perfmonger/command/plot.rb

@@ -159,6 +159,8 @@ EOS
     plot_disk(meta)
     plot_cpu(meta)
 
+    FileUtils.rm_rf(@tmpdir)
+
     true
   end
 

data/lib/perfmonger/version.rb

@@ -1,3 +1,3 @@
 module PerfMonger
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/misc/werker-box/Dockerfile

@@ -4,32 +4,30 @@ WORKDIR /app
 
 ## install packages
 RUN apt-get update
-RUN apt-get install -y build-essential libncurses-dev libreadline-dev libssl-dev gnuplot git
+RUN apt-get install -y build-essential libncurses-dev libreadline-dev libssl-dev gnuplot git gnupg2
 
 ## get source code
 RUN git clone https://github.com/hayamiz/perfmonger .
 
 ## install RVM
-RUN curl -sSL https://get.rvm.io | bash -s stable
+RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN curl -O https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer
+RUN curl -O https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer.asc
+RUN gpg --verify rvm-installer.asc
+RUN bash rvm-installer stable
 RUN ln -sf /bin/bash /bin/sh
 
 ## install ruby
-RUN bash -l -c "rvm install 1.9.3"
-RUN bash -l -c "rvm use 1.9.3 && gem install bundler && bundle"
+RUN bash -l -c "rvm install 2.2.10"
+RUN bash -l -c "rvm use 2.2.10 && gem install bundler && bundle"
 
-RUN bash -l -c "rvm install 2.0.0"
-RUN bash -l -c "rvm use 2.0.0 && gem install bundler && bundle"
+RUN bash -l -c "rvm install 2.3.8"
+RUN bash -l -c "rvm use 2.3.8 && gem install bundler && bundle"
 
-RUN bash -l -c "rvm install 2.1.10"
-RUN bash -l -c "rvm use 2.1.10 && gem install bundler && bundle"
+RUN bash -l -c "rvm install 2.4.5"
+RUN bash -l -c "rvm use 2.4.5 && gem install bundler && bundle"
 
-RUN bash -l -c "rvm install 2.2.5"
-RUN bash -l -c "rvm use 2.2.5 && gem install bundler && bundle"
-
-RUN bash -l -c "rvm install 2.3.1"
-RUN bash -l -c "rvm use 2.3.1 && gem install bundler && bundle"
-
-RUN bash -l -c "rvm install 2.4.0"
-RUN bash -l -c "rvm use 2.4.0 && gem install bundler && bundle"
+RUN bash -l -c "rvm install 2.5.3"
+RUN bash -l -c "rvm use 2.5.3 && gem install bundler && bundle"
 
 CMD true

data/misc/werker-box/build-push.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 docker build -t go-rvm .
 docker tag go-rvm hayamiz/go-rvm:wercker-env
 docker push hayamiz/go-rvm:wercker-env

data/wercker.yml

@@ -6,35 +6,17 @@ build:
     # http://devcenter.wercker.com/articles/languages/ruby.html
     steps:
         - script:
-            name: switch ruby to 1.9.3
+            name: prepare perfmonger go subsystem
             code: |
               source /etc/profile.d/rvm.sh
-              rvm use 1.9.3
-        - bundle-install
-        - script:
-            name: run rspec
-            code: |
-              bundle exec rake clean
-              bundle exec rake go_get
-              bundle exec rake spec
+              rvm use 2.2.10
+              rake go_get
 
         - script:
-            name: switch ruby to 2.0.0
-            code: |
-              source /etc/profile.d/rvm.sh
-              rvm use 2.0.0
-        - bundle-install
-        - script:
-            name: run rspec
-            code: |
-              bundle exec rake clean
-              bundle exec rake spec
-        - script:
-            name: switch ruby to 2.1.10
+            name: switch ruby to 2.2.10
             code: |
-
               source /etc/profile.d/rvm.sh
-              rvm use 2.1.10
+              rvm use 2.2.10
         - bundle-install
         - script:
             name: run rspec
@@ -43,10 +25,10 @@ build:
               bundle exec rake spec
 
         - script:
-            name: switch ruby to 2.2.5
+            name: switch ruby to 2.3.8
             code: |
               source /etc/profile.d/rvm.sh
-              rvm use 2.2.5
+              rvm use 2.3.8
         - bundle-install
         - script:
             name: run rspec
@@ -55,10 +37,10 @@ build:
               bundle exec rake spec
 
         - script:
-            name: switch ruby to 2.3.1
+            name: switch ruby to 2.4.5
             code: |
               source /etc/profile.d/rvm.sh
-              rvm use 2.3.1
+              rvm use 2.4.5
         - bundle-install
         - script:
             name: run rspec
@@ -67,10 +49,10 @@ build:
               bundle exec rake spec
 
         - script:
-            name: switch ruby to 2.4.0
+            name: switch ruby to 2.5.3
             code: |
               source /etc/profile.d/rvm.sh
-              rvm use 2.4.0
+              rvm use 2.5.3
         - bundle-install
         - script:
             name: run rspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - core/perfmonger-plot-formatter.go
 - core/perfmonger-recorder.go
 - core/perfmonger-summarizer.go
+- core/perfmonger-viewer.go
 - core/subsystem/Makefile
 - core/subsystem/perfmonger.go
 - core/subsystem/perfmonger_darwin.go
@@ -137,6 +138,8 @@ files:
 - lib/exec/perfmonger-recorder_linux_amd64
 - lib/exec/perfmonger-summarizer_darwin_amd64
 - lib/exec/perfmonger-summarizer_linux_amd64
+- lib/exec/perfmonger-viewer_darwin_amd64
+- lib/exec/perfmonger-viewer_linux_amd64
 - lib/perfmonger.rb
 - lib/perfmonger/cli.rb
 - lib/perfmonger/command/base_command.rb
@@ -212,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: yet anothor performance measurement/monitoring tool