perfmonger 0.6.1 → 0.7.0

data/spec/play_spec.rb

@@ -0,0 +1,21 @@
+
+require 'spec_helper'
+
+describe '[play] subcommand' do
+  it 'should print 3 JSON records for busy100.pgr' 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
+
+    stdout_from(cmd).each_line do |line|
+      expect do
+        JSON.parse(line)
+      end.not_to raise_error
+
+      json = JSON.parse(line)
+      expect(json.keys.sort).to eq %w{time cpu disk net}.sort
+    end
+  end
+end

data/spec/plot_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+# TODO: examples for options
+
+describe '[plot] subcommand' do
+  before(:each) do
+    if ! system("type gnuplot >/dev/null 2>&1")
+      skip "gnuplot is not available"
+    end
+  end
+
+  it 'should create PDFs for busy100.pgr' do
+    busy100 = data_file "busy100.pgr"
+
+    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")
+  end
+
+  it 'should create PDFs, data and gnuplot files when --save is given' do
+    busy100 = data_file "busy100.pgr"
+
+    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")
+  end
+end

data/spec/record_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe '[record] subcommand' do
+  before(:each) do
+    skip_if_proc_is_not_available
+  end
+
+  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
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,33 @@
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+
+if ENV['RUBYLIB']
+  ENV['RUBYLIB'] += ":"
+else
+  ENV['RUBYLIB'] = ""
+end
+ENV['RUBYLIB'] += File.expand_path('../../lib', __FILE__)
+
+TEST_DATA_DIR = File.expand_path('../data', __FILE__)
+
+require 'perfmonger'
+require 'tempfile'
+require 'pathname'
+Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
+
+def data_file(rel_path)
+  File.expand_path(rel_path, TEST_DATA_DIR)
+end
+
+def perfmonger_bin
+  File.expand_path('../../bin/perfmonger', __FILE__)
+end
+
+RSpec.configure do |config|
+  # RSpec config here
+end
+
+def skip_if_proc_is_not_available
+  if ! File.exists?("/proc/diskstats")
+    skip "/proc/diskstats is not available."
+  end
+end

data/spec/stat_spec.rb

@@ -0,0 +1,15 @@
+
+require 'spec_helper'
+
+describe '[stat] subcommand' do
+  before(:each) do
+    skip_if_proc_is_not_available
+  end
+
+  it 'should print "Execution time: XXX.XXX"' do
+    cmd = "#{perfmonger_bin} stat -- sleep 1"
+    run(cmd)
+    assert_success(true)
+    check_file_presence("perfmonger.pgr")
+  end
+end

data/spec/summary_spec.rb

@@ -0,0 +1,51 @@
+
+require 'spec_helper'
+
+describe '[summary] subcommand' do
+  it 'should print valid output' do
+    busy100 = data_file "busy100.pgr"
+    cmd = "#{perfmonger_bin} summary #{busy100}"
+    run(cmd)
+    assert_success(true)
+    output = stdout_from(cmd)
+
+    # measurement duration
+    expect(output).to match(/^Duration: (\d+\.\d+) sec$/)
+
+    # CPU usage
+    non_idle_regex = /Non-idle usage: (\d+\.\d+) %$/
+    usr_regex = /%usr: (\d+\.\d+) %$/
+    idle_regex = /Idle usage: (\d+\.\d+) %$/
+    expect(output).to match(non_idle_regex)
+    expect(output).to match(usr_regex)
+    expect(output).to match(idle_regex)
+
+    non_idle_regex =~ output; non_idle_usage = Float($~[1])
+    idle_regex =~ output; idle_usage = Float($~[1])
+    usr_regex =~ output; usr_usage = Float($~[1])
+
+    expect(non_idle_usage).to be_within(1.0).of(100.0)
+    expect(usr_usage).to be_within(1.0).of(100.0)
+    expect(idle_usage).to be_within(1.0).of(99.0)
+    expect(non_idle_usage + idle_usage).to be_within(0.1).of(200.0)
+
+    # disk usage
+    expect(output).to match(/^\* Average DEVICE usage: .+$/)
+  end
+
+  it 'should print valid JSON if --json option is given' do
+    busy100 = data_file "busy100.pgr"
+    cmd = "#{perfmonger_bin} summary --json #{busy100}"
+    run(cmd)
+    assert_success(true)
+    output = stdout_from(cmd)
+
+    expect do
+      JSON.parse(output)
+    end.not_to raise_error
+
+    json = JSON.parse(output)
+
+    expect(json.keys.sort).to eq %w{cpu disk net exectime}.sort
+  end
+end

data/spec/support/aruba.rb

@@ -0,0 +1,11 @@
+require 'aruba/api'
+require 'aruba/reporting'
+
+RSpec.configure do |config|
+  config.include Aruba::Api
+
+  config.before(:each) do
+    restore_env
+    clean_current_dir
+  end
+end

data/wercker.yml

@@ -0,0 +1,59 @@
+box: hayamiz/rvm-golang
+# Build definition
+build:
+    # The steps that will be executed on build
+    # See the Ruby section on the wercker devcenter:
+    # http://devcenter.wercker.com/articles/languages/ruby.html
+    steps:
+        - script:
+            name: install gnuplot and check terminal
+            code: |
+              sudo apt-get update
+              sudo apt-get install gnuplot
+              gnuplot -e "set terminal" < /dev/null 2>&1
+
+        - script:
+            name: install go packages
+            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
+        - bundle-install
+        - script:
+            name: run rspec
+            code: |
+              bundle exec rake clean
+              bundle exec rake spec
+
+        - rvm-use:
+            version: 2.0.0-p598
+        - bundle-install
+        - script:
+            name: run rspec
+            code: |
+              bundle exec rake clean
+              bundle exec rake spec
+
+        - rvm-use:
+            version: 2.1.5
+        - bundle-install
+        - script:
+            name: run rspec
+            code: |
+              bundle exec rake clean
+              bundle exec rake spec
+
+        - rvm-use:
+            version: 2.2.0
+        - bundle-install
+        - script:
+            name: run rspec
+            code: |
+              bundle exec rake clean
+              bundle exec rake spec
+
+        - script:
+            name: run go test
+            code: |
+              bundle exec rake test_core

metadata

@@ -1,76 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: rake
   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: 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: rake-compiler
   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: 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
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: yet anothor performance measurement/monitoring tool
 email: y.hayamizu@gmail.com
 executables:
 - perfmonger
-extensions:
-- ext/perfmonger/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- .dir-locals.el
-- .gitignore
-- .rspec
-- .travis.yml
+- ".dir-locals.el"
+- ".gitignore"
+- ".rspec"
+- ".tachikoma.yml"
+- ".travis.yml"
 - COPYING
 - Gemfile
+- Guardfile
 - HOWTO.md
 - NEWS
 - README.md
 - Rakefile
 - bin/perfmonger
+- core/Makefile
+- core/build.sh
+- core/perfmonger-player.go
+- core/perfmonger-recorder.go
+- core/perfmonger-summarizer.go
+- core/subsystem/Makefile
+- core/subsystem/perfmonger.go
+- core/subsystem/perfmonger_darwin.go
+- core/subsystem/perfmonger_linux.go
+- core/subsystem/perfmonger_linux_test.go
+- core/subsystem/stat.go
+- core/subsystem/stat_test.go
+- core/subsystem/usage.go
+- core/subsystem/usage_test.go
 - data/NOTICE
 - data/Twitter_Bootstrap_LICENSE.txt
 - data/assets/css/bootstrap-responsive.css
@@ -84,25 +141,25 @@ files:
 - data/assets/js/canvasjs.js
 - data/assets/js/canvasjs.min.js
 - data/sysstat.ioconf
-- ext/perfmonger/extconf.rb
-- ext/perfmonger/perfmonger.h
-- ext/perfmonger/perfmonger_record.c
-- ext/perfmonger/sysstat/common.c
-- ext/perfmonger/sysstat/common.h
-- ext/perfmonger/sysstat/ioconf.c
-- ext/perfmonger/sysstat/ioconf.h
-- ext/perfmonger/sysstat/iostat.c
-- ext/perfmonger/sysstat/iostat.h
-- ext/perfmonger/sysstat/libsysstat.h
-- ext/perfmonger/sysstat/mpstat.c
-- ext/perfmonger/sysstat/mpstat.h
-- ext/perfmonger/sysstat/rd_stats.c
-- ext/perfmonger/sysstat/rd_stats.h
-- ext/perfmonger/sysstat/sysconfig.h
+- lib/exec/operationBinding.rb.svn-base
+- lib/exec/perfmonger-player_darwin_amd64
+- lib/exec/perfmonger-player_linux_386
+- lib/exec/perfmonger-player_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-summary_linux_386
+- lib/exec/perfmonger-summary_linux_amd64
 - lib/perfmonger.rb
 - lib/perfmonger/cli.rb
 - lib/perfmonger/command/base_command.rb
+- lib/perfmonger/command/core.rb
 - lib/perfmonger/command/fingerprint.rb
+- lib/perfmonger/command/live.rb
+- lib/perfmonger/command/play.rb
 - lib/perfmonger/command/plot.rb
 - lib/perfmonger/command/record.rb
 - lib/perfmonger/command/record_option.rb
@@ -112,43 +169,58 @@ files:
 - lib/perfmonger/command/summary.rb
 - lib/perfmonger/config.rb
 - lib/perfmonger/version.rb
+- misc/_perfmonger
+- misc/perfmonger-completion.bash
 - misc/release-howto.txt
 - misc/sample-cpu.png
 - misc/sample-read-iops.png
 - perfmonger.gemspec
-- test/run-test.sh
-- test/spec/bin_spec.rb
-- test/spec/data/2devices.expected
-- test/spec/data/2devices.output
-- test/spec/spec_helper.rb
-- test/spec/summary_spec.rb
-- test/test-perfmonger.c
-- test/test.h
+- spec/data/busy100.pgr
+- 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
+- wercker.yml
 homepage: http://github.com/hayamiz/perfmonger/
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: ! "\n============================================================\n\nThank
-  you for installing perfmonger.\nTry to start performance monitoring with:\n\n    perfmonger
-  record\n\nEnjoy.\n\n============================================================\n\n"
+post_install_message: |2+
+
+  ============================================================
+
+  Thank you for installing perfmonger.
+  Try to start performance monitoring with:
+
+      perfmonger record
+
+  Enjoy.
+
+  ============================================================
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: yet anothor performance measurement/monitoring tool
 test_files: []
-has_rdoc: 

data/ext/perfmonger/extconf.rb

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-
-require 'mkmf'
-
-$objs = ["perfmonger_record.o", "sysstat/common.o", "sysstat/ioconf.o", "sysstat/iostat.o", "sysstat/mpstat.o", "sysstat/rd_stats.o"]
-
-$cleanfiles += ["perfmonger_record.o", "sysstat/common.o", "sysstat/ioconf.o", "sysstat/iostat.o", "sysstat/mpstat.o", "sysstat/rd_stats.o"]
-
-create_makefile 'perfmonger/perfmonger_record'
-
-mk = open('Makefile').read
-
-mk.gsub!(/^LDSHARED = .*$/, "LDSHARED = $(CC)")
-mk.gsub!(/^DLLIB = .*$/, "DLLIB = $(TARGET)")
-
-open('Makefile', 'w') do |f|
-  f.write(mk)
-end

data/ext/perfmonger/perfmonger.h

@@ -1,58 +0,0 @@
-/* -*- indent-tabs-mode: nil -*- */
-
-#ifndef PERFMONGER_H
-#define PERFMONGER_H
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <pthread.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <signal.h>
-
-#include "sysstat/libsysstat.h"
-
-
-typedef struct {
-    // switches
-    bool report_cpu;
-    bool report_io;
-    bool report_ctxsw;
-
-    // device nr and list
-    int nr_dev;
-    char **dev_list;
-	bool all_devices;
-
-    // OUTPUT FILE
-    FILE *output;
-
-    // data collection interval
-    double interval;
-    bool interval_backoff;
-
-    double start_delay;
-
-    double timeout;
-
-    bool verbose;
-} option_t;
-
-int  parse_args(int argc, char **argv, option_t *opt);
-void print_help(void);
-void init_subsystem(option_t *opt);
-void destroy_subsystem(option_t *opt);
-
-void collector_loop(option_t *opt);
-void output_stat(option_t *opt, int curr);
-
-#endif