perfmonger 0.10.2 → 0.12.1

data/spec/perfmonger_spec.rb

@@ -1,7 +1,7 @@
 
 require 'spec_helper'
 
-describe "perfmonger command" do
+RSpec.describe "perfmonger command" do
   it "should be an executable" do
     expect(File.executable?(perfmonger_bin)).to be true
   end

data/spec/play_spec.rb

@@ -1,7 +1,7 @@
 
 require 'spec_helper'
 
-describe '[play] subcommand' do
+RSpec.describe '[play] subcommand' do
   it 'should print 3 JSON records for busy100.pgr' do
     busy100 = data_file "busy100.pgr"
     cmd = "#{perfmonger_bin} play #{busy100}"

data/spec/plot_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # TODO: examples for options
 
-describe '[plot] subcommand' do
+RSpec.describe '[plot] subcommand' do
   let(:busy100_disk_dat) {
     File.read(data_file "busy100.pgr.plot-formatted.disk.dat")
   }
@@ -74,4 +74,19 @@ describe '[plot] subcommand' do
     expect("disk.dat").to have_file_content busy100_disk_dat
     expect("cpu.dat").to have_file_content busy100_cpu_dat
   end
+
+  it "should work with --disk-only option" do
+    busy100 = data_file "busy100.pgr.gz"
+
+    cmd = "#{perfmonger_bin} plot --save #{busy100} --disk-only sda1"
+
+    run(cmd, 30)
+
+    expect(last_command_started).to be_successfully_executed
+
+    disk_dat = File.expand_path("disk.dat", last_command_started.working_directory)
+    total_write_iops = `cat #{disk_dat}|grep total -A 2|tail -n1|awk '{print $3}'`.to_f
+
+    expect(total_write_iops).to be_within(1.67).of(0.01)
+  end
 end

data/spec/record_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe '[record] subcommand' do
+RSpec.describe '[record] subcommand' do
   before(:each) do
     skip_if_proc_is_not_available
   end
@@ -9,7 +9,16 @@ describe '[record] subcommand' do
     cmd = "#{perfmonger_bin} record --timeout 1"
     run(cmd)
     expect(last_command_started).to be_successfully_executed
+    expect("perfmonger.pgr.gz").to be_an_existing_file # default file name
+    expect(last_command_started.stdout).to be_empty
+  end
+
+  it 'should create a non-gzipped logfile' do
+    cmd = "#{perfmonger_bin} record --timeout 1 --no-gzip"
+    run(cmd)
+    expect(last_command_started).to be_successfully_executed
     expect("perfmonger.pgr").to be_an_existing_file # default file name
     expect(last_command_started.stdout).to be_empty
   end
+
 end

data/spec/spec_helper.rb

@@ -19,15 +19,40 @@ def data_file(rel_path)
 end
 
 def perfmonger_bin
-  File.expand_path('../../bin/perfmonger', __FILE__)
+  File.expand_path('../../exe/perfmonger', __FILE__)
 end
 
 RSpec.configure do |config|
-  # RSpec config here
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  config.disable_monkey_patching!
+
+  config.warnings = true
+
+  if config.files_to_run.one?
+    config.default_formatter = "doc"
+  end
+
+  config.profile_examples = 10
+
+  config.order = :random
+  # Kernel.srand config.seed
 end
 
 def skip_if_proc_is_not_available
-  if ! File.exists?("/proc/diskstats")
+  if ! File.exist?("/proc/diskstats")
     skip "/proc/diskstats is not available."
   end
 end

data/spec/stat_spec.rb

@@ -1,7 +1,7 @@
 
 require 'spec_helper'
 
-describe '[stat] subcommand' do
+RSpec.describe '[stat] subcommand' do
   before(:each) do
     skip_if_proc_is_not_available
   end
@@ -10,6 +10,6 @@ describe '[stat] subcommand' do
     cmd = "#{perfmonger_bin} stat -- sleep 1"
     run(cmd)
     expect(last_command_started).to be_successfully_executed
-    expect("perfmonger.pgr").to be_an_existing_file
+    expect("perfmonger.pgr.gz").to be_an_existing_file
   end
 end

data/spec/summary_spec.rb

@@ -1,7 +1,7 @@
 
 require 'spec_helper'
 
-describe '[summary] subcommand' do
+RSpec.describe '[summary] subcommand' do
   let(:busy100_summary) do
     content = File.read(data_file "busy100.pgr.summary")
 

data/wercker.yml

@@ -1,4 +1,4 @@
-box: hayamiz/rvm-golang
+box: hayamiz/go-rvm:wercker-env-0.11.2
 # Build definition
 build:
     # The steps that will be executed on build
@@ -6,19 +6,17 @@ build:
     # http://devcenter.wercker.com/articles/languages/ruby.html
     steps:
         - script:
-            name: install gnuplot and check terminal
+            name: prepare perfmonger go subsystem
             code: |
-              sudo apt-get update
-              sudo apt-get install gnuplot
-              gnuplot -e "set terminal" < /dev/null 2>&1
+              source /etc/profile.d/rvm.sh
+              rvm use 2.4.9
+              rake go_get
 
         - script:
-            name: install go packages
+            name: switch ruby to 2.4.9
             code: |
-              go get -u golang.org/x/crypto/ssh/terminal
-              go get -u github.com/hayamiz/perfmonger/core/subsystem
-        - rvm-use:
-            version: 1.9.3-p551
+              source /etc/profile.d/rvm.sh
+              rvm use 2.4.9
         - bundle-install
         - script:
             name: run rspec
@@ -26,8 +24,11 @@ build:
               bundle exec rake clean
               bundle exec rake spec
 
-        - rvm-use:
-            version: 2.0.0-p598
+        - script:
+            name: switch ruby to 2.5.7
+            code: |
+              source /etc/profile.d/rvm.sh
+              rvm use 2.5.7
         - bundle-install
         - script:
             name: run rspec
@@ -35,8 +36,11 @@ build:
               bundle exec rake clean
               bundle exec rake spec
 
-        - rvm-use:
-            version: 2.1.5
+        - script:
+            name: switch ruby to 2.6.5
+            code: |
+              source /etc/profile.d/rvm.sh
+              rvm use 2.6.5
         - bundle-install
         - script:
             name: run rspec
@@ -44,8 +48,11 @@ build:
               bundle exec rake clean
               bundle exec rake spec
 
-        - rvm-use:
-            version: 2.2.0
+        - script:
+            name: switch ruby to 2.7.0
+            code: |
+              source /etc/profile.d/rvm.sh
+              rvm use 2.7.0
         - bundle-install
         - script:
             name: run rspec
@@ -57,3 +64,9 @@ build:
             name: run go test
             code: |
               bundle exec rake test_core
+    after-steps:
+      - slack-notifier:
+          url: $SLACK_URL
+          channel: pokeme
+          username: werckerbot
+          notify_on: "failed"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.12.1
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,13 +99,15 @@ files:
 - NEWS
 - README.md
 - Rakefile
-- bin/perfmonger
 - core/Makefile
 - core/build.sh
-- core/perfmonger-player.go
-- core/perfmonger-plot-formatter.go
-- core/perfmonger-recorder.go
-- core/perfmonger-summarizer.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
@@ -129,18 +131,17 @@ files:
 - data/assets/js/canvasjs.js
 - data/assets/js/canvasjs.min.js
 - data/sysstat.ioconf
+- exe/perfmonger
 - lib/exec/perfmonger-player_darwin_amd64
-- lib/exec/perfmonger-player_linux_386
 - lib/exec/perfmonger-player_linux_amd64
 - lib/exec/perfmonger-plot-formatter_darwin_amd64
-- lib/exec/perfmonger-plot-formatter_linux_386
 - lib/exec/perfmonger-plot-formatter_linux_amd64
 - lib/exec/perfmonger-recorder_darwin_amd64
-- lib/exec/perfmonger-recorder_linux_386
 - lib/exec/perfmonger-recorder_linux_amd64
 - lib/exec/perfmonger-summarizer_darwin_amd64
-- lib/exec/perfmonger-summarizer_linux_386
 - 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
@@ -163,6 +164,8 @@ files:
 - misc/release-howto.txt
 - misc/sample-cpu.png
 - misc/sample-read-iops.png
+- misc/werker-box/Dockerfile
+- misc/werker-box/build-push.sh
 - perfmonger.gemspec
 - spec/data/busy100.pgr
 - spec/data/busy100.pgr.gz
@@ -214,8 +217,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: yet anothor performance measurement/monitoring tool
-test_files: []
+test_files:
+- spec/data/busy100.pgr
+- spec/data/busy100.pgr.gz
+- spec/data/busy100.pgr.played
+- spec/data/busy100.pgr.plot-formatted.cpu.dat
+- spec/data/busy100.pgr.plot-formatted.disk.dat
+- spec/data/busy100.pgr.summary
+- spec/data/busy100.pgr.summary.json
+- spec/fingerprint_spec.rb
+- spec/live_spec.rb
+- spec/perfmonger_spec.rb
+- spec/play_spec.rb
+- spec/plot_spec.rb
+- spec/record_spec.rb
+- spec/spec_helper.rb
+- spec/stat_spec.rb
+- spec/summary_spec.rb
+- spec/support/aruba.rb

data/core/perfmonger-player.go

@@ -1,196 +0,0 @@
-//usr/bin/env go run $0 $@ ; exit
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/gob"
-	"fmt"
-	"io"
-	"os"
-
-	ss "github.com/hayamiz/perfmonger/core/subsystem"
-)
-
-func showCpuStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
-	cusage, err := ss.GetCpuUsage(prev_rec.Cpu, cur_rec.Cpu)
-	if err != nil {
-		return err
-	}
-	buffer.WriteString(`,"cpu":`)
-	cusage.WriteJsonTo(buffer)
-
-	return nil
-}
-
-func showInterruptStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
-	// intr_usage, err := ss.GetInterruptUsage(
-	// 	prev_rec.Time, prev_rec.Interrupt,
-	// 	cur_rec.Time, cur_rec.Interrupt)
-	// if err != nil {
-	// 	return err
-	// }
-	//
-	// buffer.WriteString(`,"intr":`)
-	// intr_usage.WriteJsonTo(buffer)
-	//
-	// return nil
-
-	intr_usage, err := ss.GetInterruptUsage(
-		prev_rec.Time, prev_rec.Interrupt,
-		cur_rec.Time, cur_rec.Interrupt)
-	if err != nil {
-		return err
-	}
-
-	buffer.WriteString(`,"intr":`)
-	intr_usage.WriteJsonTo(buffer)
-
-	return nil
-}
-
-func showDiskStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
-	dusage, err := ss.GetDiskUsage(
-		prev_rec.Time, prev_rec.Disk,
-		cur_rec.Time, cur_rec.Disk)
-	if err != nil {
-		return err
-	}
-
-	buffer.WriteString(`,"disk":`)
-	dusage.WriteJsonTo(buffer)
-
-	return nil
-}
-
-func showNetStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
-	dusage, err := ss.GetNetUsage(
-		prev_rec.Time, prev_rec.Net,
-		cur_rec.Time, cur_rec.Net,
-	)
-	if err != nil {
-		return err
-	}
-
-	buffer.WriteString(`,"net":`)
-	dusage.WriteJsonTo(buffer)
-
-	return nil
-}
-
-func showStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
-	buffer.WriteString(fmt.Sprintf(`{"time":%.3f`, float64(cur_rec.Time.UnixNano())/1e9))
-	if cur_rec.Cpu != nil {
-		err := showCpuStat(buffer, prev_rec, cur_rec)
-		if err != nil {
-			return err
-		}
-	}
-	if cur_rec.Interrupt != nil {
-		err := showInterruptStat(buffer, prev_rec, cur_rec)
-		if err != nil {
-			return err
-		}
-	}
-	if cur_rec.Disk != nil {
-		err := showDiskStat(buffer, prev_rec, cur_rec)
-		if err != nil {
-			return err
-		}
-	}
-	if cur_rec.Net != nil {
-		err := showNetStat(buffer, prev_rec, cur_rec)
-		if err != nil {
-			return err
-		}
-	}
-	buffer.WriteString("}\n")
-
-	return nil
-}
-
-func main() {
-	args := os.Args
-	var in *os.File
-	var out *bufio.Writer
-
-	if len(args) < 2 {
-		in = os.Stdin
-	} else {
-		f, err := os.Open(args[1])
-		if err != nil {
-			panic(err)
-		}
-		in = f
-		defer f.Close()
-	}
-	input_reader := newPerfmongerLogReader(in)
-	dec := gob.NewDecoder(input_reader)
-
-	out = bufio.NewWriter(os.Stdout)
-
-	var cheader ss.CommonHeader
-	var pheader ss.PlatformHeader
-	var records = make([]ss.StatRecord, 2)
-	curr := 0
-
-	var err error
-
-	err = dec.Decode(&cheader)
-	if err == io.EOF {
-		return
-	}
-	if err != nil {
-		panic(err)
-	}
-	err = dec.Decode(&pheader)
-	if err == io.EOF {
-		return
-	}
-	if err != nil {
-		panic(err)
-	}
-
-	// read first record
-	err = dec.Decode(&records[curr])
-	if err == io.EOF {
-		return
-	} else if err != nil {
-		panic(err)
-	}
-	curr ^= 1
-
-	buffer := bytes.NewBuffer([]byte{})
-	for {
-		prev_rec := &records[curr^1]
-		cur_rec := &records[curr]
-
-		err = dec.Decode(cur_rec)
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			panic(err)
-		}
-
-		err = showStat(buffer, prev_rec, cur_rec)
-		if err != nil {
-			buffer.Reset()
-			fmt.Fprintln(os.Stderr, "skip by err")
-			continue
-		}
-
-		_, err = out.WriteString(buffer.String())
-		err = out.Flush()
-		if err != nil {
-			// stdout is closed
-			break
-		}
-
-		buffer.Reset()
-
-		curr ^= 1
-	}
-
-	return
-}