ruby-prof 0.17.0 → 0.18.0

data/test/stack_printer_test.rb

@@ -1,78 +1,77 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-# Test data
-#     A
-#    / \
-#   B   C
-#        \
-#         B
-
-class STPT
-  def a
-    100.times{b}
-    300.times{c}
-    c;c;c
-  end
-
-  def b
-    sleep 0
-  end
-
-  def c
-    5.times{b}
-  end
-end
-
-class StackPrinterTest < TestCase
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
-  def test_stack_can_be_printed
-    start_time = Time.now
-    RubyProf.start
-    5.times{STPT.new.a}
-    result = RubyProf.stop
-    end_time = Time.now
-    expected_time = end_time - start_time
-
-    file_contents = nil
-    assert_nothing_raised { file_contents = print(result) }
-    # TODO: why are thread ids negative on travis-ci.org (32 bit build maybe?)
-    re = /Thread: (-?\d+)(, Fiber: (-?\d+))? \(100\.00% ~ ([\.0-9]+)\)/
-    assert_match(re, file_contents)
-    file_contents =~ re
-    actual_time = $4.to_f
-    assert_in_delta(expected_time, actual_time, 0.1)
-  end
-
-  def test_method_elimination
-    RubyProf.start
-    5.times{STPT.new.a}
-    result = RubyProf.stop
-    assert_nothing_raised {
-      # result.dump
-      result.eliminate_methods!([/Integer#times/])
-      # $stderr.puts "================================"
-      # result.dump
-      print(result)
-    }
-  end
-
-  private
-  def print(result)
-    test = caller.first =~ /in `(.*)'/ ? $1 : "test"
-    testfile_name = "#{RubyProf.tmpdir}/ruby_prof_#{test}.html"
-    # puts "printing to #{testfile_name}"
-    printer = RubyProf::CallStackPrinter.new(result)
-    File.open(testfile_name, "w") {|f| printer.print(f, :threshold => 0, :min_percent => 0, :title => "ruby_prof #{test}")}
-    system("open '#{testfile_name}'") if RUBY_PLATFORM =~ /darwin/ && ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT']=="1"
-    assert File.exist?(testfile_name), "#{testfile_name} does not exist"
-    assert File.readable?(testfile_name), "#{testfile_name} is no readable"
-    File.read(testfile_name)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+# Test data
+#     A
+#    / \
+#   B   C
+#        \
+#         B
+
+class STPT
+  def a
+    100.times{b}
+    300.times{c}
+    c;c;c
+  end
+
+  def b
+    sleep 0
+  end
+
+  def c
+    5.times{b}
+  end
+end
+
+class StackPrinterTest < TestCase
+  def setup
+    # Need to use wall time for this test due to the sleep calls
+    RubyProf::measure_mode = RubyProf::WALL_TIME
+  end
+
+  def test_stack_can_be_printed
+    start_time = Time.now
+    RubyProf.start
+    5.times{STPT.new.a}
+    result = RubyProf.stop
+    end_time = Time.now
+    expected_time = end_time - start_time
+
+    file_contents = nil
+    assert_nothing_raised { file_contents = print(result) }
+    re = /Thread: (\d+)(, Fiber: (\d+))? \([\.0-9]+.[\.0-9]+% ~ ([\.0-9]+)\)/
+    assert_match(re, file_contents)
+    file_contents =~ re
+    actual_time = $4.to_f
+    assert_in_delta(expected_time, actual_time, 0.1)
+  end
+
+  def test_method_elimination
+    RubyProf.start
+    5.times{STPT.new.a}
+    result = RubyProf.stop
+    assert_nothing_raised {
+      # result.dump
+      result.eliminate_methods!([/Integer#times/])
+      # $stderr.puts "================================"
+      # result.dump
+      print(result)
+    }
+  end
+
+  private
+  def print(result)
+    test = caller.first =~ /in `(.*)'/ ? $1 : "test"
+    testfile_name = "#{RubyProf.tmpdir}/ruby_prof_#{test}.html"
+    # puts "printing to #{testfile_name}"
+    printer = RubyProf::CallStackPrinter.new(result)
+    File.open(testfile_name, "w") {|f| printer.print(f, :threshold => 0, :min_percent => 0, :title => "ruby_prof #{test}")}
+    system("open '#{testfile_name}'") if RUBY_PLATFORM =~ /darwin/ && ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT']=="1"
+    assert File.exist?(testfile_name), "#{testfile_name} does not exist"
+    assert File.readable?(testfile_name), "#{testfile_name} is no readable"
+    File.read(testfile_name)
+  end
+end

data/test/stack_test.rb

@@ -1,138 +1,138 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-# Test data
-#     A
-#    / \
-#   B   C
-#        \
-#         B
-
-class StackClass
-  def a
-    sleep 1
-    b
-    c
-  end
-
-  def b
-    sleep 2
-  end
-
-  def c
-    sleep 3
-    b
-  end
-end
-
-class StackTest < TestCase
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
-  def test_call_sequence
-    c = StackClass.new
-    result = RubyProf.profile do
-      c.a
-    end
-
-    # Length should be 5:
-    #   StackTest#test_call_sequence
-    #   StackClass#a
-    #   Kernel#sleep
-    #   StackClass#c
-    #   StackClass#b
-
-    methods = result.threads.first.methods.sort.reverse
-    assert_equal(5, methods.length)
-
-    # Check StackTest#test_call_sequence
-    method = methods[0]
-    assert_equal('StackTest#test_call_sequence', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(8, method.total_time, 0.25)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(8, method.children_time, 0.25)
-    assert_equal(1, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StackTest#test_call_sequence', call_info.call_sequence)
-    assert_equal(1, call_info.children.length)
-
-    # Check StackClass#a
-    method = methods[1]
-    assert_equal('StackClass#a', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(8, method.total_time, 0.15)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(8, method.children_time, 0.05)
-    assert_equal(1, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StackTest#test_call_sequence->StackClass#a', call_info.call_sequence)
-    assert_equal(3, call_info.children.length)
-
-    # Check Kernel#sleep
-    method = methods[2]
-    assert_equal('Kernel#sleep', method.full_name)
-    assert_equal(4, method.called)
-    assert_in_delta(8, method.total_time, 0.05)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(8, method.self_time, 0.05)
-    assert_in_delta(0, method.children_time, 0.05)
-    assert_equal(4, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StackTest#test_call_sequence->StackClass#a->Kernel#sleep', call_info.call_sequence)
-    assert_equal(0, call_info.children.length)
-
-    call_info = method.call_infos[1]
-    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#b->Kernel#sleep', call_info.call_sequence)
-    assert_equal(0, call_info.children.length)
-
-    call_info = method.call_infos[2]
-    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c->Kernel#sleep', call_info.call_sequence)
-    assert_equal(0, call_info.children.length)
-
-    call_info = method.call_infos[3]
-    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c->StackClass#b->Kernel#sleep', call_info.call_sequence)
-    assert_equal(0, call_info.children.length)
-
-    # Check StackClass#c
-    method = methods[3]
-    assert_equal('StackClass#c', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(5, method.total_time, 0.05)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(5, method.children_time, 0.05)
-    assert_equal(1, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c', call_info.call_sequence)
-    assert_equal(2, call_info.children.length)
-
-    # Check StackClass#b
-    method = methods[4]
-    assert_equal('StackClass#b', method.full_name)
-    assert_equal(2, method.called)
-    assert_in_delta(4, method.total_time, 0.05)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(4, method.children_time, 0.05)
-    assert_equal(2, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#b', call_info.call_sequence)
-    assert_equal(1, call_info.children.length)
-
-    call_info = method.call_infos[1]
-    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c->StackClass#b', call_info.call_sequence)
-    assert_equal(1, call_info.children.length)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+# Test data
+#     A
+#    / \
+#   B   C
+#        \
+#         B
+
+class StackClass
+  def a
+    sleep 1
+    b
+    c
+  end
+
+  def b
+    sleep 2
+  end
+
+  def c
+    sleep 3
+    b
+  end
+end
+
+class StackTest < TestCase
+  def setup
+    # Need to use wall time for this test due to the sleep calls
+    RubyProf::measure_mode = RubyProf::WALL_TIME
+  end
+
+  def test_call_sequence
+    c = StackClass.new
+    result = RubyProf.profile do
+      c.a
+    end
+
+    # Length should be 5:
+    #   StackTest#test_call_sequence
+    #   StackClass#a
+    #   Kernel#sleep
+    #   StackClass#c
+    #   StackClass#b
+
+    methods = result.threads.first.methods.sort.reverse
+    assert_equal(5, methods.length)
+
+    # Check StackTest#test_call_sequence
+    method = methods[0]
+    assert_equal('StackTest#test_call_sequence', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(8, method.total_time, 0.25)
+    assert_in_delta(0, method.wait_time, 0.01)
+    assert_in_delta(0, method.self_time, 0.01)
+    assert_in_delta(8, method.children_time, 0.25)
+    assert_equal(1, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StackTest#test_call_sequence', call_info.call_sequence)
+    assert_equal(1, call_info.children.length)
+
+    # Check StackClass#a
+    method = methods[1]
+    assert_equal('StackClass#a', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(8, method.total_time, 0.15)
+    assert_in_delta(0, method.wait_time, 0.01)
+    assert_in_delta(0, method.self_time, 0.01)
+    assert_in_delta(8, method.children_time, 0.05)
+    assert_equal(1, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StackTest#test_call_sequence->StackClass#a', call_info.call_sequence)
+    assert_equal(3, call_info.children.length)
+
+    # Check Kernel#sleep
+    method = methods[2]
+    assert_equal('Kernel#sleep', method.full_name)
+    assert_equal(4, method.called)
+    assert_in_delta(8, method.total_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.01)
+    assert_in_delta(8, method.self_time, 0.05)
+    assert_in_delta(0, method.children_time, 0.05)
+    assert_equal(4, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StackTest#test_call_sequence->StackClass#a->Kernel#sleep', call_info.call_sequence)
+    assert_equal(0, call_info.children.length)
+
+    call_info = method.call_infos[1]
+    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#b->Kernel#sleep', call_info.call_sequence)
+    assert_equal(0, call_info.children.length)
+
+    call_info = method.call_infos[2]
+    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c->Kernel#sleep', call_info.call_sequence)
+    assert_equal(0, call_info.children.length)
+
+    call_info = method.call_infos[3]
+    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c->StackClass#b->Kernel#sleep', call_info.call_sequence)
+    assert_equal(0, call_info.children.length)
+
+    # Check StackClass#c
+    method = methods[3]
+    assert_equal('StackClass#c', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(5, method.total_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.01)
+    assert_in_delta(0, method.self_time, 0.01)
+    assert_in_delta(5, method.children_time, 0.05)
+    assert_equal(1, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c', call_info.call_sequence)
+    assert_equal(2, call_info.children.length)
+
+    # Check StackClass#b
+    method = methods[4]
+    assert_equal('StackClass#b', method.full_name)
+    assert_equal(2, method.called)
+    assert_in_delta(4, method.total_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.01)
+    assert_in_delta(0, method.self_time, 0.01)
+    assert_in_delta(4, method.children_time, 0.05)
+    assert_equal(2, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#b', call_info.call_sequence)
+    assert_equal(1, call_info.children.length)
+
+    call_info = method.call_infos[1]
+    assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c->StackClass#b', call_info.call_sequence)
+    assert_equal(1, call_info.children.length)
+  end
+end

data/test/start_stop_test.rb

@@ -1,112 +1,112 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class StartStopTest < TestCase
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
-  def method1
-     RubyProf.start
-     method2
-  end
-
-  def method2
-     method3
-  end
-
-  def method3
-    sleep(2)
-    @result = RubyProf.stop
-  end
-  
-  def test_extra_stop_should_raise
-    RubyProf.start
-    assert_raises(RuntimeError) do
-      RubyProf.start
-    end
-    
-    assert_raises(RuntimeError) do
-      RubyProf.profile {}
-    end
-    
-    RubyProf.stop # ok
-    assert_raises(RuntimeError) do
-      RubyProf.stop
-    end
-  end
-    
-
-  def test_different_methods
-    method1
-
-    # Ruby prof should be stopped
-    assert_equal(false, RubyProf.running?)
-
-
-    # Length should be 4:
-    #   StartStopTest#method1
-    #   StartStopTest#method2
-    #   StartStopTest#method3
-    #   Kernel#sleep
-
-    methods = @result.threads.first.methods.sort.reverse
-    assert_equal(4, methods.length)
-
-    # Check StackTest#test_call_sequence
-    method = methods[0]
-    assert_equal('StartStopTest#method1', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(2, method.total_time, 0.05)
-    assert_in_delta(0, method.wait_time, 0.02)
-    assert_in_delta(0, method.self_time, 0.02)
-    assert_in_delta(2, method.children_time, 0.05)
-    assert_equal(1, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StartStopTest#method1', call_info.call_sequence)
-    assert_equal(1, call_info.children.length)
-
-    method = methods[1]
-    assert_equal('StartStopTest#method2', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(2, method.total_time, 0.05)
-    assert_in_delta(0, method.wait_time, 0.02)
-    assert_in_delta(0, method.self_time, 0.02)
-    assert_in_delta(2, method.children_time, 0.05)
-    assert_equal(1, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StartStopTest#method1->StartStopTest#method2', call_info.call_sequence)
-    assert_equal(1, call_info.children.length)
-
-    method = methods[2]
-    assert_equal('StartStopTest#method3', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(2, method.total_time, 0.02)
-    assert_in_delta(0, method.wait_time, 0.02)
-    assert_in_delta(0, method.self_time, 0.02)
-    assert_in_delta(2, method.children_time, 0.02)
-    assert_equal(1, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StartStopTest#method1->StartStopTest#method2->StartStopTest#method3', call_info.call_sequence)
-    assert_equal(1, call_info.children.length)
-
-    method = methods[3]
-    assert_equal('Kernel#sleep', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(2, method.total_time, 0.02)
-    assert_in_delta(0, method.wait_time, 0.02)
-    assert_in_delta(2, method.self_time, 0.02)
-    assert_in_delta(0, method.children_time, 0.02)
-    assert_equal(1, method.call_infos.length)
-
-    call_info = method.call_infos[0]
-    assert_equal('StartStopTest#method1->StartStopTest#method2->StartStopTest#method3->Kernel#sleep', call_info.call_sequence)
-    assert_equal(0, call_info.children.length)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class StartStopTest < TestCase
+  def setup
+    # Need to use wall time for this test due to the sleep calls
+    RubyProf::measure_mode = RubyProf::WALL_TIME
+  end
+
+  def method1
+     RubyProf.start
+     method2
+  end
+
+  def method2
+     method3
+  end
+
+  def method3
+    sleep(2)
+    @result = RubyProf.stop
+  end
+  
+  def test_extra_stop_should_raise
+    RubyProf.start
+    assert_raises(RuntimeError) do
+      RubyProf.start
+    end
+    
+    assert_raises(RuntimeError) do
+      RubyProf.profile {}
+    end
+    
+    RubyProf.stop # ok
+    assert_raises(RuntimeError) do
+      RubyProf.stop
+    end
+  end
+    
+
+  def test_different_methods
+    method1
+
+    # Ruby prof should be stopped
+    assert_equal(false, RubyProf.running?)
+
+
+    # Length should be 4:
+    #   StartStopTest#method1
+    #   StartStopTest#method2
+    #   StartStopTest#method3
+    #   Kernel#sleep
+
+    methods = @result.threads.first.methods.sort.reverse
+    assert_equal(4, methods.length)
+
+    # Check StackTest#test_call_sequence
+    method = methods[0]
+    assert_equal('StartStopTest#method1', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(2, method.total_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.02)
+    assert_in_delta(0, method.self_time, 0.02)
+    assert_in_delta(2, method.children_time, 0.05)
+    assert_equal(1, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StartStopTest#method1', call_info.call_sequence)
+    assert_equal(1, call_info.children.length)
+
+    method = methods[1]
+    assert_equal('StartStopTest#method2', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(2, method.total_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.02)
+    assert_in_delta(0, method.self_time, 0.02)
+    assert_in_delta(2, method.children_time, 0.05)
+    assert_equal(1, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StartStopTest#method1->StartStopTest#method2', call_info.call_sequence)
+    assert_equal(1, call_info.children.length)
+
+    method = methods[2]
+    assert_equal('StartStopTest#method3', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(2, method.total_time, 0.02)
+    assert_in_delta(0, method.wait_time, 0.02)
+    assert_in_delta(0, method.self_time, 0.02)
+    assert_in_delta(2, method.children_time, 0.02)
+    assert_equal(1, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StartStopTest#method1->StartStopTest#method2->StartStopTest#method3', call_info.call_sequence)
+    assert_equal(1, call_info.children.length)
+
+    method = methods[3]
+    assert_equal('Kernel#sleep', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(2, method.total_time, 0.02)
+    assert_in_delta(0, method.wait_time, 0.02)
+    assert_in_delta(2, method.self_time, 0.02)
+    assert_in_delta(0, method.children_time, 0.02)
+    assert_equal(1, method.call_infos.length)
+
+    call_info = method.call_infos[0]
+    assert_equal('StartStopTest#method1->StartStopTest#method2->StartStopTest#method3->Kernel#sleep', call_info.call_sequence)
+    assert_equal(0, call_info.children.length)
+  end
+end