perfmonger 0.9.0 → 0.10.1

data/spec/data/busy100.pgr.summary.json

@@ -0,0 +1 @@
+{"exectime":7.524,"cpu":{"num_core":2,"all":{"usr":100.33,"nice":0.00,"sys":0.40,"idle":99.27,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.40,"nice":0.00,"sys":0.40,"idle":99.20,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":99.87,"nice":0.00,"sys":0.13,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":0.66,"rkbyteps":0.00,"wkbyteps":10.63,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":0.66,"rkbyteps":0.00,"wkbyteps":10.63,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":1.33,"rkbyteps":0.00,"wkbyteps":21.27,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.02,"rxpktps":0.27,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.10,"txpktps":0.27,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.02,"rxpktps":0.27,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.10,"txpktps":0.27,"txerrps":0.00,"txdropps":0.00}}}

data/spec/play_spec.rb

@@ -19,4 +19,20 @@ describe '[play] subcommand' do
       expect(json.keys.sort).to eq %w{time cpu disk net}.sort
     end
   end
+
+  it "should play plain pgr file" do
+    busy100 = data_file "busy100.pgr"
+    cmd = "#{perfmonger_bin} play #{busy100}"
+    run(cmd)
+    expect(last_command_started).to be_successfully_executed
+    expect(last_command_started.stdout).to eq File.read(data_file "busy100.pgr.played")
+  end
+
+  it "should play plain gzipped file" do
+    busy100 = data_file "busy100.pgr.gz"
+    cmd = "#{perfmonger_bin} play #{busy100}"
+    run(cmd)
+    expect(last_command_started).to be_successfully_executed
+    expect(last_command_started.stdout).to eq File.read(data_file "busy100.pgr.played")
+  end
 end

data/spec/plot_spec.rb

@@ -3,6 +3,14 @@ require 'spec_helper'
 # TODO: examples for options
 
 describe '[plot] subcommand' do
+  let(:busy100_disk_dat) {
+    File.read(data_file "busy100.pgr.plot-formatted.disk.dat")
+  }
+  let(:busy100_cpu_dat) {
+    File.read(data_file "busy100.pgr.plot-formatted.cpu.dat")
+  }
+
+
   before(:each) do
     if ! system("type gnuplot >/dev/null 2>&1")
       skip "gnuplot is not available"
@@ -15,8 +23,8 @@ describe '[plot] subcommand' do
     cmd = "#{perfmonger_bin} plot #{busy100}"
     run(cmd, 30)
     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("disk-iops.pdf").to be_an_existing_file
+    expect("disk-transfer.pdf").to be_an_existing_file
     expect("cpu.pdf").to be_an_existing_file
     expect("allcpu.pdf").to be_an_existing_file
   end
@@ -28,16 +36,42 @@ describe '[plot] subcommand' do
     run(cmd, 30)
     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("disk-iops.pdf").to be_an_existing_file
+    expect("disk-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("disk.gp").to be_an_existing_file
+    expect("disk.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
+
+    # cpu.dat content check
+    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 gzipped perfmonger logfile' do
+    busy100 = data_file "busy100.pgr.gz"
+
+    cmd = "#{perfmonger_bin} plot --save #{busy100}"
+    run(cmd, 30)
+    expect(last_command_started).to be_successfully_executed
+
+    expect("disk-iops.pdf").to be_an_existing_file
+    expect("disk-transfer.pdf").to be_an_existing_file
+    expect("cpu.pdf").to be_an_existing_file
+    expect("allcpu.pdf").to be_an_existing_file
+
+    expect("disk.gp").to be_an_existing_file
+    expect("disk.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
+
+    # cpu.dat content check
+    expect("disk.dat").to have_file_content busy100_disk_dat
+    expect("cpu.dat").to have_file_content busy100_cpu_dat
   end
 end

data/spec/summary_spec.rb

@@ -2,6 +2,17 @@
 require 'spec_helper'
 
 describe '[summary] subcommand' do
+  let(:busy100_summary) do
+    content = File.read(data_file "busy100.pgr.summary")
+
+    # strip file path from content
+    content.gsub(/^== performance summary of .*$/, "")
+  end
+
+  let(:busy100_summary_json) do
+    File.read(data_file "busy100.pgr.summary.json")
+  end
+
   it 'should print valid output' do
     busy100 = data_file "busy100.pgr"
     cmd = "#{perfmonger_bin} summary #{busy100}"
@@ -48,4 +59,23 @@ describe '[summary] subcommand' do
 
     expect(json.keys.sort).to eq %w{cpu disk net exectime}.sort
   end
+
+  it 'should work with gzipped input' do
+    busy100 = data_file "busy100.pgr.gz"
+    cmd = "#{perfmonger_bin} summary #{busy100}"
+    run(cmd)
+    expect(last_command_started).to be_successfully_executed
+    output = last_command_started.stdout
+
+    # strip file path from output
+    output.gsub!(/^== performance summary of .*$/, "")
+    expect(output).to eq busy100_summary
+
+
+    cmd = "#{perfmonger_bin} summary --json #{busy100}"
+    run(cmd)
+    expect(last_command_started).to be_successfully_executed
+    output = last_command_started.stdout
+    expect(output).to eq busy100_summary_json
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - core/subsystem/stat_test.go
 - core/subsystem/usage.go
 - core/subsystem/usage_test.go
+- core/utils.go
 - data/NOTICE
 - data/Twitter_Bootstrap_LICENSE.txt
 - data/assets/css/bootstrap-responsive.css
@@ -164,6 +165,12 @@ files:
 - misc/sample-read-iops.png
 - perfmonger.gemspec
 - 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