perfmonger 0.6.1 → 0.7.0

data/test/spec/bin_spec.rb

@@ -1,37 +0,0 @@
-
-require 'spec_helper'
-
-describe "PerfmongerCommand" do
-  before(:each) do
-    @perfmonger_command = File.expand_path('../../src/perfmonger', __FILE__)
-  end
-
-  it "should be an executable" do
-    File.executable?(@perfmonger_command).should be_true
-  end
-
-  it 'should print version number if --version specified' do
-    `#{@perfmonger_command} --version`.should include(PerfMonger::VERSION)
-  end
-
-  describe 'stat subcommand' do
-    it 'should print "Execution time: XXX.XXX"' do
-      if File.exists?("/proc/diskstats")
-        `#{@perfmonger_command} stat -- sleep 1`.should match(/^Execution time: (\d+)\.(\d+)$/)
-      else
-        # do nothing
-        true.should be_true
-      end
-    end
-  end
-
-  describe 'summary subcommand' do
-    it 'should print expected output with 2devices.log' do
-      File.open(data_file('2devices.output'), "w") do |f|
-        f.print(`#{@perfmonger_command} summary #{data_file('2devices.log')}`)
-      end
-
-      system("diff -u #{data_file('2devices.expected')} #{data_file('2devices.output')}").should be_true
-    end
-  end
-end

data/test/spec/data/2devices.expected

@@ -1,42 +0,0 @@
-
-== Performance summary of 'spec/data/2devices.log' ==
-
-record duration: 1.00 sec
-
-* Average CPU usage (MAX: 200 %)
-  * Non idle portion: 200.00
-       %usr: 0.00
-       %sys: 200.00
-       %irq: 0.00
-      %soft: 0.00
-     %other: 0.00
-  * Idle portion: 0.00
-    %iowait: 0.00
-      %idle: 0.00
-
-* Average DEVICE usage: sda
-        read IOPS: 1.00
-       write IOPS: 0.00
-  read throughput: 0.00 MB/s
- write throughput: 0.00 MB/s
-     read latency: 53.00 msec
-    write latency: 0.0 usec
-      read amount: 512.00 bytes
-     write amount: 0.00 bytes
-
-* Average DEVICE usage: sdb
-        read IOPS: 0.00
-       write IOPS: 0.00
-  read throughput: 0.00 MB/s
- write throughput: 0.00 MB/s
-     read latency: 0.0 usec
-    write latency: 0.0 usec
-      read amount: 0.00 bytes
-     write amount: 0.00 bytes
-
-* TOTAL DEVICE usage: sda, sdb
-        read IOPS: 1.00
-       write IOPS: 0.00
-  read throughput: 0.00 MB/s
- write throughput: 0.00 MB/s
-

data/test/spec/data/2devices.output

@@ -1,42 +0,0 @@
-
-== Performance summary of 'spec/data/2devices.log' ==
-
-record duration: 1.00 sec
-
-* Average CPU usage (MAX: 200 %)
-  * Non idle portion: 200.00
-       %usr: 0.00
-       %sys: 200.00
-       %irq: 0.00
-      %soft: 0.00
-     %other: 0.00
-  * Idle portion: 0.00
-    %iowait: 0.00
-      %idle: 0.00
-
-* Average DEVICE usage: sda
-        read IOPS: 1.00
-       write IOPS: 0.00
-  read throughput: 0.00 MB/s
- write throughput: 0.00 MB/s
-     read latency: 53.00 msec
-    write latency: 0.0 usec
-      read amount: 512.00 bytes
-     write amount: 0.00 bytes
-
-* Average DEVICE usage: sdb
-        read IOPS: 0.00
-       write IOPS: 0.00
-  read throughput: 0.00 MB/s
- write throughput: 0.00 MB/s
-     read latency: 0.0 usec
-    write latency: 0.0 usec
-      read amount: 0.00 bytes
-     write amount: 0.00 bytes
-
-* TOTAL DEVICE usage: sda, sdb
-        read IOPS: 1.00
-       write IOPS: 0.00
-  read throughput: 0.00 MB/s
- write throughput: 0.00 MB/s
-

data/test/spec/spec_helper.rb

@@ -1,20 +0,0 @@
-# encoding: utf-8
-
-$LOAD_PATH << File.expand_path('../../src/ruby', __FILE__)
-
-TEST_DATA_DIR = File.expand_path('../data', __FILE__)
-
-require 'perfmonger'
-require 'tempfile'
-require 'pathname'
-
-def data_file(rel_path)
-  from = Pathname.new(Dir.pwd)
-  path = Pathname.new(File.expand_path(rel_path, TEST_DATA_DIR))
-
-  path.relative_path_from(from).to_s
-end
-
-RSpec.configure do |config|
-  # RSpec config here
-end

data/test/spec/summary_spec.rb

@@ -1,193 +0,0 @@
-
-require 'spec_helper'
-
-describe PerfMonger::Command::SummaryCommand do
-  before(:each) do
-    @summary = PerfMonger::Command::SummaryCommand.new
-    @logfile = data_file('test.log')
-    @logfile_2devices = data_file('2devices.log')
-  end
-
-  describe 'read_logfile method' do
-    it 'should return 3 valid records' do
-      records = @summary.read_logfile(@logfile)
-      records.size.should == 3
-      records.each do |record|
-        record.should be_a Hash
-        record.should include "time"
-
-        record.should include "ioinfo"
-        record["ioinfo"].should include "devices"
-        record["ioinfo"]["devices"].should be_a Array
-        record["ioinfo"]["devices"].should include "sda"
-        record["ioinfo"].should include "sda"
-        record["ioinfo"]["sda"].should be_a Hash
-        record["ioinfo"]["sda"].should include "riops"
-        record["ioinfo"]["sda"].should include "wiops"
-        record["ioinfo"]["sda"].should include "rsecps"
-        record["ioinfo"]["sda"].should include "wsecps"
-        record["ioinfo"]["sda"].should include "r_await"
-        record["ioinfo"]["sda"].should include "w_await"
-
-        record.should include "cpuinfo"
-        record["cpuinfo"].should be_a Hash
-        record["cpuinfo"].should include "nr_cpu"
-        record["cpuinfo"].should include "cpus"
-        record["cpuinfo"].should include "all"
-      end
-    end
-  end
-
-  describe 'make_summary method' do
-    before(:each) do
-      @records = @summary.read_logfile(@logfile)
-    end
-
-    it 'should return nil for empty records' do
-      @summary.make_summary([]).should be_nil
-    end
-
-    it 'should return valid format result' do
-      summary = @summary.make_summary(@records)
-
-      summary.should be_a Hash
-      summary.should include "time"
-
-      summary.should include "ioinfo"
-      summary["ioinfo"].should include "devices"
-      summary["ioinfo"]["devices"].should be_a Array
-      summary["ioinfo"]["devices"].should include "sda"
-      summary["ioinfo"].should include "sda"
-      summary["ioinfo"]["sda"].should be_a Hash
-      summary["ioinfo"]["sda"].should include "riops"
-      summary["ioinfo"]["sda"].should include "wiops"
-      summary["ioinfo"]["sda"].should include "rsecps"
-      summary["ioinfo"]["sda"].should include "wsecps"
-      summary["ioinfo"]["sda"].should include "r_await"
-      summary["ioinfo"]["sda"].should include "w_await"
-
-      summary.should include "cpuinfo"
-      summary["cpuinfo"].should include "nr_cpu"
-      summary["cpuinfo"].should include "cpus"
-      summary["cpuinfo"].should include "all"
-      cpu_entries = [summary["cpuinfo"]["all"], *summary["cpuinfo"]["cpus"]]
-      cpu_entries.each do |entry|
-        entry.should be_a Hash
-        entry.should include "usr"
-        entry.should include "nice"
-        entry.should include "sys"
-        entry.should include "iowait"
-        entry.should include "irq"
-        entry.should include "soft"
-        entry.should include "steal"
-        entry.should include "guest"
-        entry.should include "idle"
-      end
-    end
-
-    it 'should calculate avg. IOPS correctly against non-equal intervals' do
-      @records[0]["time"] = 0.0
-      @records[1]["time"] = 1.0
-      @records[2]["time"] = 3.0
-
-      @records[0]["ioinfo"]["sda"]["riops"] = 0.0 # no effect for result
-      @records[1]["ioinfo"]["sda"]["riops"] = 3.0
-      @records[2]["ioinfo"]["sda"]["riops"] = 6.0
-
-      # avg. riops should be ((3.0 * 1.0 + 6.0 * 3.0) / 3.0) == 5.0
-      summary = @summary.make_summary(@records)
-
-      summary["ioinfo"]["sda"]["riops"].should be_within(5.0e-6).of(5.0)
-    end
-
-    it 'should return 0.0 for r_await if all values are zero' do
-      @records[0]["ioinfo"]["sda"]["r_await"] = 0.0
-      @records[1]["ioinfo"]["sda"]["r_await"] = 0.0
-      @records[2]["ioinfo"]["sda"]["r_await"] = 0.0
-
-      summary = @summary.make_summary(@records)
-
-      summary["ioinfo"]["sda"]["r_await"].should == 0.0
-    end
-
-    it 'should calculate avg. r_await/w_await correctly' do
-      @records[0]["ioinfo"]["sda"]["riops"] = 0.0
-      @records[0]["ioinfo"]["sda"]["r_await"] = 0.0
-      @records[1]["ioinfo"]["sda"]["riops"] = 100.0
-      @records[1]["ioinfo"]["sda"]["r_await"] = 1.0
-      @records[2]["ioinfo"]["sda"]["riops"] = 200.0
-      @records[2]["ioinfo"]["sda"]["r_await"] = 4.0
-
-      summary = @summary.make_summary(@records)
-
-      summary["ioinfo"]["sda"]["r_await"].should be_within(3.0e-6).of(3.0)
-    end
-  end
-
-  describe 'make_summary method with 2 devices' do
-    before(:each) do
-      @records = @summary.read_logfile(@logfile_2devices)
-    end
-
-    it 'should calculate avg. riops in total' do
-      @records[0]["time"] = 0.0
-      @records[1]["time"] = 0.5
-
-      @records[0]["ioinfo"]["total"]["riops"] = 0.0
-      @records[1]["ioinfo"]["total"]["riops"] = 10.0
-
-      summary = @summary.make_summary(@records)
-
-      summary["ioinfo"]["total"]["riops"].should be_within(10.0e-6).of(10.0)
-    end
-  end
-
-  it "should respond to make_accumulation" do
-    @summary.should respond_to(:make_accumulation)
-  end
-
-  describe "make_accumulation" do
-    before(:each) do
-      @records = @summary.read_logfile(@logfile)
-    end
-
-    it "should return valid format" do
-      accum = @summary.make_accumulation(@records)
-      accum.should be_a Hash
-      accum.keys.should include "ioinfo"
-      # accum.keys.should include "cpuinfo"
-    end
-
-    it "should return nil if no ioinfo" do
-      @records.each do |record|
-        record.delete("ioinfo")
-      end
-
-      @summary.make_accumulation(@records).should be_nil
-    end
-
-    it "should return nil if only 1 record given" do
-      @summary.make_accumulation([@records.first]).should be_nil
-    end
-
-    it "should return valid IO data volume accumulation" do
-      @records[0]["time"] = 0.0
-      @records[0]["ioinfo"]["sda"]["riops"] = 0.0
-      @records[0]["ioinfo"]["sda"]["rsecps"] = 0.0
-      @records[0]["ioinfo"]["sda"]["avgrq-sz"] = 16.0
-      @records[1]["time"] = 2.0
-      @records[1]["ioinfo"]["sda"]["riops"] = 2.0
-      @records[1]["ioinfo"]["sda"]["rsecps"] = 2.0
-      @records[1]["ioinfo"]["sda"]["avgrq-sz"] = 16.0
-      @records[2]["time"] = 4.0
-      @records[2]["ioinfo"]["sda"]["riops"] = 1.0
-      @records[2]["ioinfo"]["sda"]["rsecps"] = 4.0
-      @records[2]["ioinfo"]["sda"]["avgrq-sz"] = 16.0
-
-      accum = @summary.make_accumulation(@records)
-
-      accum["ioinfo"]["sda"]["read_requests"].should be_within(6.0e-6).of(6.0)
-      accum["ioinfo"]["sda"]["read_bytes"].should be_within(1e-6).of(6144.0)
-    end
-  end
-end

data/test/test-perfmonger.c

@@ -1,145 +0,0 @@
-
-#include "test.h"
-#include <perfmonger.h>
-
-
-/* global variables */
-
-int argc;
-char **argv;
-
-/* utility function proto */
-
-void setup_arguments(const char *arg, ...);
-
-/* test function proto */
-void test_parse_args         (void);
-void test_parse_args_switches(void);
-
-/* cutter setup/teardown */
-
-void
-cut_setup(void)
-{
-    argc = 0;
-    argv = NULL;
-}
-
-void
-cut_teardown(void)
-{
-    
-}
-
-/* utility function bodies */
-
-void
-setup_arguments(const char *arg, ...)
-{
-    va_list ap;
-
-    argc = 1;
-    argv = malloc(sizeof(char *));
-    argv[0] = (char *) arg;
-
-    va_start(ap, arg);
-    while((arg = va_arg(ap, char *)) != NULL) {
-        argv = realloc(argv, sizeof(char *) * (argc + 1));
-        argv[argc ++] = (char *) arg;
-    }
-    va_end(ap);
-
-    cut_take_memory(argv);
-}
-
-/* test function bodies */
-
-void
-test_parse_args(void)
-{
-    option_t option;
-
-    setup_arguments("collector", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-
-    /* show help and exit */
-    setup_arguments("collector", "-h", NULL);
-    cut_assert_equal_int(-1, parse_args(argc, argv, &option));
-
-    /* check -d option and default values */
-    setup_arguments("collector", "-d", "/path/to/dev", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_equal_int(1, option.nr_dev);
-    cut_assert_equal_string("/path/to/dev", option.dev_list[0]);
-    cut_assert_equal_double(1.0, 0.0001, option.interval);
-    cut_assert_false(option.report_cpu);
-    cut_assert_true(option.report_io);
-    cut_assert_false(option.verbose);
-
-    /* with multiple devices */
-    setup_arguments("collector", "-d", "/path/to/dev0", "-d", "/path/to/dev1", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_equal_int(2, option.nr_dev);
-    cut_assert_equal_string("/path/to/dev0", option.dev_list[0]);
-    cut_assert_equal_string("/path/to/dev1", option.dev_list[1]);
-    cut_assert_true(option.report_io);
-
-    /* with interval in integer */
-    setup_arguments("collector", "-d", "/path/to/dev", "-i", "10", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_equal_double(10.0, 0.0001, option.interval);
-    cut_assert_true(option.report_io);
-
-    /* with interval in floating point */
-    setup_arguments("collector", "-d", "/path/to/dev", "-i", "0.5", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_equal_double(0.5, 0.0001, option.interval);
-    cut_assert_true(option.report_io);
-
-    /* with verbose */
-    setup_arguments("collector", "-d", "/path/to/dev", "-v", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_true(option.verbose);
-    cut_assert_true(option.report_io);
-}
-
-void
-test_parse_args_switches(void)
-{
-    option_t option;
-
-    /* with cpu (default if no device is specified) */
-    setup_arguments("collector", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_true (option.report_cpu);
-    cut_assert_false(option.report_io);
-    cut_assert_false(option.report_ctxsw);
-
-    /* without cpu if some devices are specified */
-    setup_arguments("collector", "-d", "/path/to/dev", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_false(option.report_cpu);
-    cut_assert_true (option.report_io);
-    cut_assert_false(option.report_ctxsw);
-
-    /* with cpu if explicitly specified by -C */
-    setup_arguments("collector", "-C", "-d", "/path/to/dev", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_true (option.report_cpu);
-    cut_assert_true (option.report_io);
-    cut_assert_false(option.report_ctxsw);
-
-    /* without cpu if context switch option is specified */
-    setup_arguments("collector", "-S", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_false(option.report_cpu);
-    cut_assert_false(option.report_io);
-    cut_assert_true (option.report_ctxsw);
-
-    /* with cpu if explicitly specified by -C */
-    setup_arguments("collector", "-C", "-S", NULL);
-    cut_assert_equal_int(0, parse_args(argc, argv, &option));
-    cut_assert_true (option.report_cpu);
-    cut_assert_false(option.report_io);
-    cut_assert_true (option.report_ctxsw);
-}

data/test/test.h

@@ -1,9 +0,0 @@
-#ifndef TEST_H
-#define TEST_H
-
-#include <cutter.h>
-#include <gcutter.h>
-#include <glib.h>
-
-
-#endif