perfmonger 0.11.1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 238da9d952389a0d84f3e619631bb907d604b98a
-  data.tar.gz: 982086728c90cd798a1ae0316af2cb1e23c87370
+SHA256:
+  metadata.gz: 1a2bc69e72d02745481dafb5bec13073d4289a3f38cdf8eb253416e649e56ff5
+  data.tar.gz: fd5db8b9b288b62060df2ab5881ec8c777c320479d53420ddef3e4420ade9c9a
 SHA512:
-  metadata.gz: 77b4709a0399f3c3725488b5005ee27028eb5231ae1dc8523c5dc24a92c4adfd8db92e65eba696de7533712e2817923f87edb3582df468fc02b340b1819d5dd9
-  data.tar.gz: 4fffefe769a436e2456f57c4bef540dbd95f0c4a43d92b392c913c7f472bb8ae7b2d4c8f5f8275f29fe5b89a2576969fe25f5266d8546e45ccfc3289bfd9dbfa
+  metadata.gz: c7184d7eeb69b60188a740031143eede5188b56dbf84cd6a4bdd28302439faba79f390f8baf27f1e33275d04355c1e99c42eb09b1eb663a243c0046e1cc5a29e
+  data.tar.gz: cda569ba86554c985e46249d77d1fdc606fbe126150591dcec55ccbe82eabd13b6081ed428c6b7301004c1955fdf00273549a82696f6ed07cd3c2bb55387dd45

data/.travis.yml

@@ -4,23 +4,20 @@ install:
   - sudo apt-get install gnuplot
   - gnuplot -e "set terminal" < /dev/null 2>&1
   - bundle install
-  - go_version="1.8.3"
+  - go_version="1.14.1"
   - wget http://golang.org/dl/go${go_version}.linux-amd64.tar.gz
   - sudo tar -C /usr/local -xzf go${go_version}.linux-amd64.tar.gz
   - export PATH=$PATH:/usr/local/go/bin
   - 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.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
 script:
+  - rake go_get
   - rake spec
   - rake test_core
 notifications:

data/NEWS

@@ -1,3 +1,39 @@
+## 2021-XX-XX: PerfMonger 0.14.0
+
+## 2021-07-26: PerfMonger 0.13.1
+  * New features
+    * [play] subcommand:
+      * Added --disk-only option to filter results of not interesting disks
+  * Note: v0.13.0 is yanked from rubygems.org
+
+## 2021-07-08: PerfMonger 0.12.1
+  * Bug fixes
+    * [record] subcommand:
+      * --kill waits until a recorder process surely exits
+
+## 2021-05-10: PerfMonger 0.12.0
+  * New features
+    * [record] subcommand:
+      * Add memory usage collection
+
+## 2021-02-10: PerfMonger 0.11.3
+  * Bug fixes
+    * [plot] subcommand:
+      * Fall back to available gnuplot terminal
+  * Changes
+    * [plot] subcommand:
+      * Added --with-gnuplot option for specifying gnuplot binary
+
+## 2020-03-31: PerfMonger 0.11.2
+  * Bug fixes
+    * [plot] subcommand:
+      * Remove temporary directory correctly
+  * Changes
+    * CI environment
+      * Changed golang version to 1.14
+      * Dropped support of ruby older than 2.4
+      * Added ruby 2.6 and 2.7
+
 ## 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

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rspec/core/rake_task'
 require "bundler/gem_tasks"
 
-task :default => [:spec, :test_core]
+task :default => [:spec, :test_core, :analyze_core]
 
 desc "Run all specs in spec directory"
 RSpec::Core::RakeTask.new(:spec)
@@ -26,21 +26,34 @@ 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"
+desc "Run tests of golang core library"
 task :test_core => [:cross_build_core] do
   Dir.chdir("./core/subsystem") do
+    # check coverage
     sh "go test -v -cover"
-
-    # running static analysis
-    sh "go vet *.go"
   end
+end
 
-  Dir.chdir("./core") do
-    sh "go vet *.go"
+desc "Run static-analysis of golang core library"
+task :analyze_core => [:cross_build_core] do
+  # running static analysis
+  Dir.chdir("./core/subsystem") do
+    ["linux", "darwin"].each do |platform|
+      puts "* ./core/subsystem"
+      sh "go vet perfmonger_#{platform}.go $(ls *.go | grep -v perfmonger_)"
+    end
   end
 
+  Dir["./core", "./core/cmd/*"].each do |dir|
+    Dir.chdir(dir) do
+      puts "* #{dir}"
+      sh "go vet *.go"
+    end
+  end
 end
 
 desc "Removed generated files"

data/core/Makefile

@@ -2,47 +2,54 @@
 # generated by build.sh
 
 GO_DEPS := subsystem/perfmonger_darwin.go subsystem/perfmonger.go subsystem/perfmonger_linux.go subsystem/perfmonger_linux_test.go subsystem/stat.go subsystem/stat_test.go subsystem/usage.go subsystem/usage_test.go utils.go
-GO_SRC := utils.go
 
 .PHONY: all build clean
 
 all: build
 
 
-../lib/exec/perfmonger-recorder_linux_amd64: perfmonger-recorder.go $(GO_DEPS)
-	go build -o $@ perfmonger-recorder.go $(GO_SRC)
+../lib/exec/perfmonger-recorder_linux_amd64: cmd/perfmonger-recorder/perfmonger-recorder.go $(GO_DEPS)
+	cd cmd/perfmonger-recorder && go build -o ../../$@ perfmonger-recorder.go
 
 
-../lib/exec/perfmonger-player_linux_amd64: perfmonger-player.go $(GO_DEPS)
-	go build -o $@ perfmonger-player.go $(GO_SRC)
+../lib/exec/perfmonger-player_linux_amd64: cmd/perfmonger-player/perfmonger-player.go $(GO_DEPS)
+	cd cmd/perfmonger-player && go build -o ../../$@ perfmonger-player.go
 
 
-../lib/exec/perfmonger-summarizer_linux_amd64: perfmonger-summarizer.go $(GO_DEPS)
-	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
+../lib/exec/perfmonger-viewer_linux_amd64: cmd/perfmonger-viewer/perfmonger-viewer.go $(GO_DEPS)
+	cd cmd/perfmonger-viewer && go build -o ../../$@ perfmonger-viewer.go
 
 
-../lib/exec/perfmonger-plot-formatter_linux_amd64: perfmonger-plot-formatter.go $(GO_DEPS)
-	go build -o $@ perfmonger-plot-formatter.go $(GO_SRC)
+../lib/exec/perfmonger-summarizer_linux_amd64: cmd/perfmonger-summarizer/perfmonger-summarizer.go $(GO_DEPS)
+	cd cmd/perfmonger-summarizer && go build -o ../../$@ perfmonger-summarizer.go
 
 
-../lib/exec/perfmonger-recorder_darwin_amd64: perfmonger-recorder.go $(GO_DEPS)
-	go build -o $@ perfmonger-recorder.go $(GO_SRC)
+../lib/exec/perfmonger-plot-formatter_linux_amd64: cmd/perfmonger-plot-formatter/perfmonger-plot-formatter.go $(GO_DEPS)
+	cd cmd/perfmonger-plot-formatter && go build -o ../../$@ perfmonger-plot-formatter.go
 
 
-../lib/exec/perfmonger-player_darwin_amd64: perfmonger-player.go $(GO_DEPS)
-	go build -o $@ perfmonger-player.go $(GO_SRC)
+../lib/exec/perfmonger-recorder_darwin_amd64: cmd/perfmonger-recorder/perfmonger-recorder.go $(GO_DEPS)
+	cd cmd/perfmonger-recorder && go build -o ../../$@ perfmonger-recorder.go
 
 
-../lib/exec/perfmonger-summarizer_darwin_amd64: perfmonger-summarizer.go $(GO_DEPS)
-	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
+../lib/exec/perfmonger-player_darwin_amd64: cmd/perfmonger-player/perfmonger-player.go $(GO_DEPS)
+	cd cmd/perfmonger-player && go build -o ../../$@ perfmonger-player.go
 
 
-../lib/exec/perfmonger-plot-formatter_darwin_amd64: perfmonger-plot-formatter.go $(GO_DEPS)
-	go build -o $@ perfmonger-plot-formatter.go $(GO_SRC)
+../lib/exec/perfmonger-viewer_darwin_amd64: cmd/perfmonger-viewer/perfmonger-viewer.go $(GO_DEPS)
+	cd cmd/perfmonger-viewer && go build -o ../../$@ perfmonger-viewer.go
 
 
-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
+../lib/exec/perfmonger-summarizer_darwin_amd64: cmd/perfmonger-summarizer/perfmonger-summarizer.go $(GO_DEPS)
+	cd cmd/perfmonger-summarizer && go build -o ../../$@ perfmonger-summarizer.go
+
+
+../lib/exec/perfmonger-plot-formatter_darwin_amd64: cmd/perfmonger-plot-formatter/perfmonger-plot-formatter.go $(GO_DEPS)
+	cd cmd/perfmonger-plot-formatter && go build -o ../../$@ perfmonger-plot-formatter.go
+
+
+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

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-READLINK=$(type -p greadlink readlink | head -1)
-cd $(dirname $($READLINK -f $0))
+cd $(cd $(dirname $0); pwd)
 
 if [[ $1 = "-" ]]; then
     # do self build
@@ -33,7 +32,7 @@ fi
 
 set -e
 
-GO_DEPS=$(ls subsystem/*.go; ls utils.go)
+GO_DEPS=$(ls subsystem/*.go utils.go)
 
 makefile=`mktemp`
 
@@ -42,7 +41,6 @@ cat <<EOF > $makefile
 # generated by build.sh
 
 GO_DEPS := $(echo ${GO_DEPS})
-GO_SRC := utils.go
 
 .PHONY: all build clean
 
@@ -57,13 +55,13 @@ 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
 
-../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH}: perfmonger-${subcmd}.go \$(GO_DEPS)
-	go build -o \$@ perfmonger-$subcmd.go \$(GO_SRC)
+../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH}: cmd/perfmonger-${subcmd}/perfmonger-${subcmd}.go \$(GO_DEPS)
+	cd cmd/perfmonger-${subcmd} && go build -o ../../\$@ perfmonger-$subcmd.go
 
 EOF
     done

data/core/{perfmonger-player.go → cmd/perfmonger-player/perfmonger-player.go}

@@ -9,15 +9,19 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"regexp"
 
 	projson "github.com/hayamiz/go-projson"
+	core "github.com/hayamiz/perfmonger/core"
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
 )
 
 type PlayerOption struct {
-	logfile string
-	color   bool
-	pretty  bool
+	logfile         string
+	color           bool
+	pretty          bool
+	disk_only       string
+	disk_only_regex *regexp.Regexp
 }
 
 var option PlayerOption
@@ -49,10 +53,11 @@ func showInterruptStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cu
 	return nil
 }
 
-func showDiskStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
-	dusage, err := ss.GetDiskUsage(
+func showDiskStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord, disk_only_regex *regexp.Regexp) error {
+	dusage, err := ss.GetDiskUsage1(
 		prev_rec.Time, prev_rec.Disk,
-		cur_rec.Time, cur_rec.Disk)
+		cur_rec.Time, cur_rec.Disk,
+		option.disk_only_regex)
 	if err != nil {
 		return err
 	}
@@ -80,7 +85,22 @@ func showNetStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec
 	return nil
 }
 
-func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
+func showMemStat(printer *projson.JsonPrinter, cur_rec *ss.StatRecord) error {
+	musage, err := ss.GetMemUsage(cur_rec.Mem)
+	if err != nil {
+		return err
+	}
+
+	printer.PutKey("mem")
+
+	musage.WriteJsonTo(printer)
+
+	return nil
+}
+
+func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord,
+	disk_only_regex *regexp.Regexp) error {
+
 	printer.Reset()
 	if option.pretty {
 		printer.SetStyle(projson.SmartStyle)
@@ -88,6 +108,7 @@ func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss
 	if option.color {
 		printer.SetColor(true)
 	}
+
 	printer.BeginObject()
 	printer.PutKey("time")
 	printer.PutFloatFmt(float64(cur_rec.Time.UnixNano())/1e9, "%.3f")
@@ -108,7 +129,7 @@ func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss
 		}
 	}
 	if cur_rec.Disk != nil {
-		err := showDiskStat(printer, prev_rec, cur_rec)
+		err := showDiskStat(printer, prev_rec, cur_rec, disk_only_regex)
 		if err != nil {
 			return err
 		}
@@ -119,6 +140,12 @@ func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss
 			return err
 		}
 	}
+	if cur_rec.Mem != nil {
+		err := showMemStat(printer, cur_rec)
+		if err != nil {
+			return err
+		}
+	}
 
 	printer.FinishObject()
 
@@ -128,9 +155,25 @@ func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss
 func parseArgs() {
 	flag.BoolVar(&option.color, "color", false, "Use colored JSON output")
 	flag.BoolVar(&option.pretty, "pretty", false, "Use human readable JSON output")
+	flag.StringVar(&option.disk_only, "disk-only", "", "Select disk devices by regex")
 
 	flag.Parse()
 
+	if len(flag.Args()) < 1 {
+		fmt.Fprintln(os.Stderr, "Insufficient argument")
+		os.Exit(1)
+	}
+
+	option.disk_only_regex = nil
+
+	if option.disk_only != "" {
+		var err error
+		option.disk_only_regex, err = regexp.Compile(option.disk_only)
+		if err != nil {
+			panic(err)
+		}
+	}
+
 	option.logfile = flag.Arg(0)
 }
 
@@ -150,7 +193,7 @@ func main() {
 		in = f
 		defer f.Close()
 	}
-	input_reader := newPerfmongerLogReader(in)
+	input_reader := core.NewPerfmongerLogReader(in)
 	dec := gob.NewDecoder(input_reader)
 
 	out = bufio.NewWriter(os.Stdout)
@@ -199,7 +242,7 @@ func main() {
 			panic(err)
 		}
 
-		err = showStat(printer, prev_rec, cur_rec)
+		err = showStat(printer, prev_rec, cur_rec, option.disk_only_regex)
 		if err != nil {
 			printer.Reset()
 			fmt.Fprintln(os.Stderr, "skip by err")

data/core/{perfmonger-plot-formatter.go → cmd/perfmonger-plot-formatter/perfmonger-plot-formatter.go}

@@ -15,6 +15,7 @@ import (
 	"sort"
 
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
+	"github.com/hayamiz/perfmonger/core"
 )
 
 type CmdOption struct {
@@ -141,7 +142,7 @@ func main() {
 	}
 	defer f.Close()
 
-	input_reader := newPerfmongerLogReader(f)
+	input_reader := core.NewPerfmongerLogReader(f)
 	dec := gob.NewDecoder(input_reader)
 
 	var cheader ss.CommonHeader

data/core/{perfmonger-recorder.go → cmd/perfmonger-recorder/perfmonger-recorder.go}

@@ -36,6 +36,7 @@ type RecorderOption struct {
 	no_intr             bool
 	no_disk             bool
 	no_net              bool
+	no_mem              bool
 	debug               bool
 	listDevices         bool
 	player_bin          string
@@ -76,6 +77,8 @@ func parseArgs() {
 		false, "Do not record disk usage")
 	flag.BoolVar(&option.no_net, "no-net",
 		false, "Do not record net usage")
+	flag.BoolVar(&option.no_mem, "no-mem",
+		false, "Do not record memory usage")
 	flag.BoolVar(&option.debug, "debug",
 		false, "Enable debug mode")
 	flag.BoolVar(&option.listDevices, "list-devices",
@@ -340,6 +343,9 @@ func main() {
 		if !option.no_net {
 			ss.ReadNetStat(record)
 		}
+		if !option.no_mem {
+			ss.ReadMemStat(record)
+		}
 
 		err = enc.Encode(record)
 		if err != nil {

data/core/{perfmonger-summarizer.go → cmd/perfmonger-summarizer/perfmonger-summarizer.go}

@@ -12,6 +12,7 @@ import (
 	"sort"
 
 	projson "github.com/hayamiz/go-projson"
+	"github.com/hayamiz/perfmonger/core"
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
 )
 
@@ -38,6 +39,7 @@ func parseArgs() {
 	flag.Parse()
 
 	if len(flag.Args()) < 1 {
+		fmt.Fprintln(os.Stderr, "Insufficient argument")
 		os.Exit(1)
 	}
 
@@ -61,7 +63,7 @@ func main() {
 	}
 	defer f.Close()
 
-	input_reader := newPerfmongerLogReader(f)
+	input_reader := core.NewPerfmongerLogReader(f)
 	dec := gob.NewDecoder(input_reader)
 
 	err = dec.Decode(&cheader)
@@ -128,7 +130,7 @@ func main() {
 			option.disk_only_regex)
 	}
 
-	if fst_record.Disk != nil && lst_record.Disk != nil {
+	if fst_record.Net != nil && lst_record.Net != nil {
 		net_usage, err = ss.GetNetUsage(
 			fst_record.Time, fst_record.Net,
 			lst_record.Time, lst_record.Net)