perfmonger 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54380ef057091f9d6829d3a792c0c4a91789b56077ff7a59b4a1bf063ec883e
-  data.tar.gz: c01127d30de0978a88bf1481357d3e20cde8193dd16e6bde9e0f2030d6423710
+  metadata.gz: 9610baac2556f61a8deb2cab5c7d4c10dac9c7da69c0c07a2f7d2b5f2414199e
+  data.tar.gz: 1e94e2c14421eabddd25f60abb8ef6e749aa57a557c4d661830b52fc5f91d7ca
 SHA512:
-  metadata.gz: 8ae9ded1f5d4c5157902ccfa23a12910866834480f7b82e1464f4c2d5e767cbf2d5752118f1aa666f445d2f61a0e5cfbc7198c3ad9cf098539c0cd96a25b12f3
-  data.tar.gz: 3c507d05cec5b3b28e49367379846009b1848ac75d23227d22a019203190b9adeaf201a25805b3746d518d221a46399580d49899f6205f236980c70b3b73a7e5
+  metadata.gz: 7a5f69061b79e2dcafe707bdb24b5a7be0443df2130bd928f33a7aba7a56623a946979ac22e0a82ce367f6d8d17d66facaf7286c6fe1c09016f8cedfc43dc5f6
+  data.tar.gz: 9754fb8acc4b1a521c2daf2a67017d95ec018b414f7f808989589efa498f3f66003f93d1d8d6aa7455a008259486f7ea71dae8c8d2934c52ed0b55e9dd0b0a1f

data/NEWS

@@ -1,5 +1,10 @@
 ## 20XX-XX-XX: PerfMonger 0.13.0
 
+## 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:

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)
@@ -30,19 +30,30 @@ task :go_get do
   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,51 +2,50 @@
 # 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-viewer_linux_amd64: perfmonger-viewer.go $(GO_DEPS)
-	go build -o $@ perfmonger-viewer.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-summarizer_linux_amd64: perfmonger-summarizer.go $(GO_DEPS)
-	go build -o $@ perfmonger-summarizer.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-plot-formatter_linux_amd64: perfmonger-plot-formatter.go $(GO_DEPS)
-	go build -o $@ perfmonger-plot-formatter.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-recorder_darwin_amd64: perfmonger-recorder.go $(GO_DEPS)
-	go build -o $@ perfmonger-recorder.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-player_darwin_amd64: perfmonger-player.go $(GO_DEPS)
-	go build -o $@ perfmonger-player.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-viewer_darwin_amd64: perfmonger-viewer.go $(GO_DEPS)
-	go build -o $@ perfmonger-viewer.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
 
 
-../lib/exec/perfmonger-summarizer_darwin_amd64: perfmonger-summarizer.go $(GO_DEPS)
-	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
+../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: perfmonger-plot-formatter.go $(GO_DEPS)
-	go build -o $@ perfmonger-plot-formatter.go $(GO_SRC)
+../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

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
 
@@ -62,8 +60,8 @@ for idx in $(seq 0 $((${#TARGET[@]}-1))); do
 
         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}

@@ -12,6 +12,7 @@ import (
 
 	projson "github.com/hayamiz/go-projson"
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
+    core "github.com/hayamiz/perfmonger/core"
 )
 
 type PlayerOption struct {
@@ -169,7 +170,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)

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-summarizer.go → cmd/perfmonger-summarizer/perfmonger-summarizer.go}

@@ -13,6 +13,7 @@ import (
 
 	projson "github.com/hayamiz/go-projson"
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
+	"github.com/hayamiz/perfmonger/core"
 )
 
 type SummaryOption struct {
@@ -61,7 +62,7 @@ func main() {
 	}
 	defer f.Close()
 
-	input_reader := newPerfmongerLogReader(f)
+	input_reader := core.NewPerfmongerLogReader(f)
 	dec := gob.NewDecoder(input_reader)
 
 	err = dec.Decode(&cheader)

data/core/go.mod

@@ -0,0 +1,10 @@
+module github.com/hayamiz/perfmonger/core
+
+go 1.15
+
+require (
+	github.com/hayamiz/go-projson v0.0.0-20210510072849-3503bd24ae61
+	github.com/jroimartin/gocui v0.4.0
+	github.com/nsf/termbox-go v1.1.1
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
+)

data/core/go.sum

@@ -0,0 +1,17 @@
+github.com/hayamiz/go-projson v0.0.0-20210510072849-3503bd24ae61 h1:elFR/pEri9bFREP6YvJQDcFjncPBDhG+SwWJjYSvY8s=
+github.com/hayamiz/go-projson v0.0.0-20210510072849-3503bd24ae61/go.mod h1:Zkuug8uJZoQ8V34UfDAFVmKLVHPhe+TJUAazUzh6s1k=
+github.com/jroimartin/gocui v0.4.0 h1:52jnalstgmc25FmtGcWqa0tcbMEWS6RpFLsOIO+I+E8=
+github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
+github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

data/core/utils.go

@@ -1,4 +1,4 @@
-package main
+package core
 
 import (
 	"bufio"
@@ -6,7 +6,7 @@ import (
 	"io"
 )
 
-func newPerfmongerLogReader(source io.Reader) io.Reader {
+func NewPerfmongerLogReader(source io.Reader) io.Reader {
 	var ret io.Reader
 	reader := bufio.NewReader(source)
 

data/lib/perfmonger/command/record.rb

@@ -31,7 +31,8 @@ class RecordCommand < BaseCommand
     if @option.kill
       unless session_pid
         # There is nothing to be killed
-        return true
+        $stderr.puts("[ERROR] No perfmonger record session is running.")
+        return false
       end
 
       begin
@@ -44,12 +45,32 @@ class RecordCommand < BaseCommand
           f.flock(File::LOCK_UN)
         end
       end
+
+      # wait until the process surely exits
+      sleeptime = 0.05
+      try = 0
+      while true
+        begin
+          Process.kill(:INT, session_pid)
+        rescue Errno::ESRCH
+          # no such process
+          break
+        end
+        sleep(sleeptime)
+        sleeptime *= 2
+        try += 1
+        if try >= 5
+          $stderr.puts("[ERROR] Cannot stop perfmonger record session correctly. PID=#{session_pid}")
+          return false
+        end
+      end
+
       return true
     end
 
     if @option.status
       unless session_pid
-        puts "[ERROR] No perfmonger-recorder is running."
+        puts "[ERROR] No perfmonger record session is running."
         return false
       end
 

data/lib/perfmonger/version.rb

@@ -1,3 +1,3 @@
 module PerfMonger
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,11 +101,13 @@ files:
 - Rakefile
 - core/Makefile
 - core/build.sh
-- core/perfmonger-player.go
-- core/perfmonger-plot-formatter.go
-- core/perfmonger-recorder.go
-- core/perfmonger-summarizer.go
-- core/perfmonger-viewer.go
+- core/cmd/perfmonger-player/perfmonger-player.go
+- core/cmd/perfmonger-plot-formatter/perfmonger-plot-formatter.go
+- core/cmd/perfmonger-recorder/perfmonger-recorder.go
+- core/cmd/perfmonger-summarizer/perfmonger-summarizer.go
+- core/cmd/perfmonger-viewer/perfmonger-viewer.go
+- core/go.mod
+- core/go.sum
 - core/subsystem/Makefile
 - core/subsystem/perfmonger.go
 - core/subsystem/perfmonger_darwin.go