perfmonger 0.8.2 → 0.9.0

data/lib/perfmonger/command/summary.rb

@@ -39,7 +39,7 @@ EOS
       end
     end
 
-    @parser.on('--disk-only REGEX', "Select disk devices that matches REGEX") do |regex|
+    @parser.on('--disk-only REGEX', "Select disk devices that matches REGEX (Ex. 'sd[b-d]')") do |regex|
       @disk_only_regex = regex
     end
   end

data/lib/perfmonger/version.rb

@@ -1,3 +1,3 @@
 module PerfMonger
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/misc/{_perfmonger → perfmonger.zsh}

@@ -1,4 +1,3 @@
-#compdef perfmonger
 
 _perfmonger-record() {
     local curcontext=$curcontext state line ret=1
@@ -6,15 +5,16 @@ _perfmonger-record() {
 
     # TODO: match -d,--device multiple times
     _arguments -w -C -S \
-        '(-D --all-devices)'{-d,--device}'[device name to be monitored]: :__perfmonger_devices' \
-        '(-d --device)'{-D,--all-devices}'[monitor all devices]' \
+        '--background[run in background mode]' \
+        '--status[show running perfmonger recording session]' \
+        '--kill[kill running perfmonger recording session]' \
+        {-d,--device}'[device name to be monitored]: :__perfmonger_devices' \
         '(-i --interval)'{-i,--interval}'[measurement interval]: interval in sec' \
-        {-l,--logfile}'[log file name]:_files' \
+        {-l,--logfile}'[log file name]: :_files' \
         {-B,--no-interval-backoff}'[prevent interval backoff]' \
         {-s,--start-delay}'[wait specified time before starting measurement]: wait time in sec' \
         {-t,--timeout}'[length of measurement time]: timeout in sec' \
-        {-C,--cpu}'[report CPU usage]' \
-        {-S,--context-switch}'[report context switches per sec]' \
+        '--no-cpu[Do not monitor CPU usage]' \
         {-v,--verbose}'[verbose]' \
         {-h,--help}'[show help]' \
         && return
@@ -26,6 +26,16 @@ _perfmonger-stat() {
     return ret
 }
 
+_perfmonger-play() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -w -C -S \
+        '*:: :_files' \
+        {-h,--help}'[show help]' \
+        && return
+}
+
 _perfmonger-summary() {
     local curcontext=$curcontext state line ret=1
     declare -A opt_args
@@ -33,9 +43,9 @@ _perfmonger-summary() {
     # TODO: accept only 1 file
     _arguments -w -C -S \
         '--json[output summary in JSON format]' \
+        '--disk-only[select disk devices that matches regexp]: regular expression for target devices' \
         {-p,--pager}'[use pager to see summary output]: pager program' \
         {-h,--help}'[show help]' \
-        {-h,--help}'[show help]' \
         '*:: :_files' \
         && return
 }
@@ -51,6 +61,10 @@ _perfmonger-plot() {
         {-T,--output-type}'[output image type]:output type:(pdf png)' \
         {-p,--prefix}'[output file name prefix]:prefix' \
         {-s,--save}'[save gnuplot script and data files]' \
+        '--disk-only[select disk devices that matches regexp]: regular expression for target devices' \
+        '--disk-read-only[plot only read performance for disks]' \
+        '--disk-write-only[plot only write performance for disks]' \
+        '--disk-read-write[plot read and write performance for disks]' \
         {-h,--help}'[show help]' \
         '*:: :_files' \
         && return
@@ -117,7 +131,9 @@ _perfmonger() {
 
 _perfmonger_commands() {
     _values 'command' \
-        'record[record system performance]' \
+        'record[record system performance into a log file]' \
+        'play[play a recorded performance log in JSON]' \
+        'live[iostat and mpstat equivalent speaking JSON]' \
         'stat[run a command and record system performance during execution]' \
         'plot[plot system performance graphs from a perfmonger log file]' \
         'fingerprint[gather all possible system config information]' \

data/perfmonger.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake-compiler"
-  s.add_development_dependency "guard-rspec"
   s.add_development_dependency "aruba"
 
   s.files       = `git ls-files`.split("\n").select do |file|

data/spec/fingerprint_spec.rb

@@ -15,21 +15,21 @@ describe '[fingerprint] subcommand' do
 
   it 'should create output tgz successfully' do
     run("#{perfmonger_bin} fingerprint output.tgz", 20)
-    assert_success(true)
-    check_file_presence("output.tgz")
+    expect(last_command_started).to be_successfully_executed
+    expect("output.tgz").to be_an_existing_file
   end
 
   it 'should create output tgz successfully with alias invocation' do
     run("#{perfmonger_bin} fp output.tgz", 20)
-    assert_success(true)
-    check_file_presence("output.tgz")
+    expect(last_command_started).to be_successfully_executed
+    expect("output.tgz").to be_an_existing_file
   end
 
   it "should create output tgz successfully with content" do
     run("#{perfmonger_bin} fingerprint output.tgz", 20)
-    assert_success(true)
+    expect(last_command_started).to be_successfully_executed
     run("tar xf output.tgz")
-    assert_success(true)
-    check_directory_presence(["output"], true)
+    expect(last_command_started).to be_successfully_executed
+    expect("output").to be_an_existing_directory
   end
 end

data/spec/live_spec.rb

@@ -8,10 +8,11 @@ describe '[live] subcommand' do
   it 'should print JSON records for 3 seconds and exit successfully.' do
     cmd = "#{perfmonger_bin} live --timeout 3"
     run(cmd, 5)
-    assert_success(true)
-    expect(stdout_from(cmd).lines.to_a.size).to eq 3
+    expect(last_command_started).to be_successfully_executed
+    expect(last_command_started.stdout.lines.to_a.size).to eq 3
 
-    stdout_from(cmd).each_line do |line|
+    run(cmd)
+    last_command_started.stdout.each_line do |line|
       expect do
         JSON.parse(line)
       end.not_to raise_error
@@ -20,6 +21,6 @@ describe '[live] subcommand' do
       expect(json.keys.sort).to eq %w{time cpu disk net}.sort
     end
 
-    check_file_presence("perfmonger.pgr")
+    expect("perfmonger.pgr").to be_an_existing_file
   end
 end

data/spec/perfmonger_spec.rb

@@ -9,29 +9,29 @@ describe "perfmonger command" do
   it 'should print help and exit with failure when no arguments given' do
     cmd = "#{perfmonger_bin}"
     run(cmd)
-    assert_success(false)
-    expect(stdout_from(cmd)).to match(/^Usage: perfmonger/)
+    expect(last_command_started).not_to be_successfully_executed
+    expect(last_command_started.stdout).to match(/^Usage: perfmonger/)
   end
 
   it 'should print help and exit with success when --help is given' do
     ["-h", "--help"].each do |arg|
       cmd = "#{perfmonger_bin} #{arg}"
       run(cmd)
-      assert_success(true)
-      expect(stdout_from(cmd)).to match(/^Usage: perfmonger/)
+      expect(last_command_started).to be_successfully_executed
+      expect(last_command_started.stdout).to match(/^Usage: perfmonger/)
     end
   end
 
   it 'should print version number if --version given' do
     cmd = "#{perfmonger_bin} --version"
     run(cmd)
-    assert_success(true)
-    expect(stdout_from(cmd)).to include(PerfMonger::VERSION)
+    expect(last_command_started).to be_successfully_executed
+    expect(last_command_started.stdout).to include(PerfMonger::VERSION)
   end
 
   it 'fails if unknown subcommand given' do
     cmd = "#{perfmonger_bin} piyo"
     run(cmd)
-    assert_success(false)
+    expect(last_command_started).not_to be_successfully_executed
   end
 end

data/spec/play_spec.rb

@@ -6,10 +6,11 @@ describe '[play] subcommand' do
     busy100 = data_file "busy100.pgr"
     cmd = "#{perfmonger_bin} play #{busy100}"
     run(cmd)
-    assert_success(true)
-    expect(stdout_from(cmd).lines.to_a.size).to eq 3
+    expect(last_command_started).to be_successfully_executed
+    expect(last_command_started.stdout.lines.to_a.size).to eq 3
 
-    stdout_from(cmd).each_line do |line|
+    run(cmd)
+    last_command_started.stdout.each_line do |line|
       expect do
         JSON.parse(line)
       end.not_to raise_error

data/spec/plot_spec.rb

@@ -14,11 +14,11 @@ describe '[plot] subcommand' do
 
     cmd = "#{perfmonger_bin} plot #{busy100}"
     run(cmd, 30)
-    assert_success(true)
-    check_file_presence("iops.pdf")
-    check_file_presence("transfer.pdf")
-    check_file_presence("cpu.pdf")
-    check_file_presence("allcpu.pdf")
+    expect(last_command_started).to be_successfully_executed
+    expect("iops.pdf").to be_an_existing_file
+    expect("transfer.pdf").to be_an_existing_file
+    expect("cpu.pdf").to be_an_existing_file
+    expect("allcpu.pdf").to be_an_existing_file
   end
 
   it 'should create PDFs, data and gnuplot files when --save is given' do
@@ -26,17 +26,18 @@ describe '[plot] subcommand' do
 
     cmd = "#{perfmonger_bin} plot --save #{busy100}"
     run(cmd, 30)
-    assert_success(true)
-    check_file_presence("iops.pdf")
-    check_file_presence("transfer.pdf")
-    check_file_presence("cpu.pdf")
-    check_file_presence("allcpu.pdf")
-
-    check_file_presence("io.gp")
-    check_file_presence("io.dat")
-    check_file_presence("cpu.gp")
-    check_file_presence("cpu.dat")
-    check_file_presence("allcpu.gp")
-    check_file_presence("allcpu.dat")
+    expect(last_command_started).to be_successfully_executed
+
+    expect("iops.pdf").to be_an_existing_file
+    expect("transfer.pdf").to be_an_existing_file
+    expect("cpu.pdf").to be_an_existing_file
+    expect("allcpu.pdf").to be_an_existing_file
+
+    expect("io.gp").to be_an_existing_file
+    expect("io.dat").to be_an_existing_file
+    expect("cpu.gp").to be_an_existing_file
+    expect("cpu.dat").to be_an_existing_file
+    expect("allcpu.gp").to be_an_existing_file
+    expect("allcpu.dat").to be_an_existing_file
   end
 end

data/spec/record_spec.rb

@@ -8,8 +8,8 @@ describe '[record] subcommand' do
   it 'should create a valid logfile with no output to stdout' do
     cmd = "#{perfmonger_bin} record --timeout 1"
     run(cmd)
-    assert_success(true)
-    check_file_presence("perfmonger.pgr") # default file name
-    expect(stdout_from(cmd)).to be_empty
+    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/stat_spec.rb

@@ -9,7 +9,7 @@ describe '[stat] subcommand' do
   it 'should print "Execution time: XXX.XXX"' do
     cmd = "#{perfmonger_bin} stat -- sleep 1"
     run(cmd)
-    assert_success(true)
-    check_file_presence("perfmonger.pgr")
+    expect(last_command_started).to be_successfully_executed
+    expect("perfmonger.pgr").to be_an_existing_file
   end
 end

data/spec/summary_spec.rb

@@ -6,8 +6,8 @@ describe '[summary] subcommand' do
     busy100 = data_file "busy100.pgr"
     cmd = "#{perfmonger_bin} summary #{busy100}"
     run(cmd)
-    assert_success(true)
-    output = stdout_from(cmd)
+    expect(last_command_started).to be_successfully_executed
+    output = last_command_started.stdout
 
     # measurement duration
     expect(output).to match(/^Duration: (\d+\.\d+) sec$/)
@@ -37,8 +37,8 @@ describe '[summary] subcommand' do
     busy100 = data_file "busy100.pgr"
     cmd = "#{perfmonger_bin} summary --json #{busy100}"
     run(cmd)
-    assert_success(true)
-    output = stdout_from(cmd)
+    expect(last_command_started).to be_successfully_executed
+    output = last_command_started.stdout
 
     expect do
       JSON.parse(output)

data/spec/support/aruba.rb

@@ -5,7 +5,6 @@ RSpec.configure do |config|
   config.include Aruba::Api
 
   config.before(:each) do
-    restore_env
-    clean_current_dir
+    setup_aruba
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +103,7 @@ files:
 - core/Makefile
 - core/build.sh
 - core/perfmonger-player.go
+- core/perfmonger-plot-formatter.go
 - core/perfmonger-recorder.go
 - core/perfmonger-summarizer.go
 - core/subsystem/Makefile
@@ -144,6 +131,9 @@ files:
 - 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
@@ -155,6 +145,7 @@ files:
 - lib/perfmonger/command/base_command.rb
 - lib/perfmonger/command/core.rb
 - lib/perfmonger/command/fingerprint.rb
+- lib/perfmonger/command/init-shell.rb
 - lib/perfmonger/command/live.rb
 - lib/perfmonger/command/play.rb
 - lib/perfmonger/command/plot.rb
@@ -166,8 +157,8 @@ files:
 - lib/perfmonger/command/summary.rb
 - lib/perfmonger/config.rb
 - lib/perfmonger/version.rb
-- misc/_perfmonger
-- misc/perfmonger-completion.bash
+- misc/perfmonger.bash
+- misc/perfmonger.zsh
 - misc/release-howto.txt
 - misc/sample-cpu.png
 - misc/sample-read-iops.png