ruby-prof 0.17.0 → 0.18.0

data/test/method_elimination_test.rb

@@ -1,84 +1,84 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-# Test data
-#     A
-#    / \
-#   B   C
-#        \
-#         B
-
-module MethodElimination
-  def self.a
-    1.times {|i| c}
-  end
-
-  def self.b
-    sleep 0.1
-  end
-
-  def self.c
-    1.times {|i| b}
-  end
-end
-
-class MethodEliminationTest < 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_setting_parent
-    result = RubyProf.profile do
-      1000.times { 1+1 }
-    end
-    method_infos = result.threads.first.methods.sort.reverse
-    assert(m1 = method_infos[0])
-    assert(c1 = m1.call_infos.first)
-    assert_nil(c1.parent)
-  end
-
-  def test_methods_can_be_eliminated
-    RubyProf.start
-    5.times {MethodElimination.a}
-    result = RubyProf.stop
-
-    methods = result.threads.first.methods.sort.reverse
-
-    assert_equal(6, methods.count)
-    assert_equal('MethodEliminationTest#test_methods_can_be_eliminated', methods[0].full_name)
-    assert_equal('Integer#times', methods[1].full_name)
-    assert_equal('<Module::MethodElimination>#a', methods[2].full_name)
-    assert_equal('<Module::MethodElimination>#c', methods[3].full_name)
-    assert_equal('<Module::MethodElimination>#b', methods[4].full_name)
-    assert_equal('Kernel#sleep', methods[5].full_name)
-
-    result.eliminate_methods!([/Integer#times/])
-
-    methods = result.threads.first.methods.sort.reverse
-    assert_equal(5, methods.count)
-    assert_equal('MethodEliminationTest#test_methods_can_be_eliminated', methods[0].full_name)
-    assert_equal('<Module::MethodElimination>#a', methods[1].full_name)
-    assert_equal('<Module::MethodElimination>#c', methods[2].full_name)
-    assert_equal('<Module::MethodElimination>#b', methods[3].full_name)
-    assert_equal('Kernel#sleep', methods[4].full_name)
-  end
-
-  private
-
-  def assert_method_has_been_eliminated(result, eliminated_method)
-    result.threads.each do |thread|
-      thread.methods.each do |method|
-        method.call_infos.each do |ci|
-          assert(ci.target != eliminated_method, "broken self")
-          assert(ci.parent.target != eliminated_method, "broken parent") if ci.parent
-          ci.children.each do |callee|
-            assert(callee.target != eliminated_method, "broken kid")
-          end
-        end
-      end
-    end
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+# Test data
+#     A
+#    / \
+#   B   C
+#        \
+#         B
+
+module MethodElimination
+  def self.a
+    1.times {|i| c}
+  end
+
+  def self.b
+    sleep 0.1
+  end
+
+  def self.c
+    1.times {|i| b}
+  end
+end
+
+class MethodEliminationTest < 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_setting_parent
+    result = RubyProf.profile do
+      1000.times { 1+1 }
+    end
+    method_infos = result.threads.first.methods.sort.reverse
+    assert(m1 = method_infos[0])
+    assert(c1 = m1.call_infos.first)
+    assert_nil(c1.parent)
+  end
+
+  def test_methods_can_be_eliminated
+    RubyProf.start
+    5.times {MethodElimination.a}
+    result = RubyProf.stop
+
+    methods = result.threads.first.methods.sort.reverse
+
+    assert_equal(6, methods.count)
+    assert_equal('MethodEliminationTest#test_methods_can_be_eliminated', methods[0].full_name)
+    assert_equal('Integer#times', methods[1].full_name)
+    assert_equal('<Module::MethodElimination>#a', methods[2].full_name)
+    assert_equal('<Module::MethodElimination>#c', methods[3].full_name)
+    assert_equal('<Module::MethodElimination>#b', methods[4].full_name)
+    assert_equal('Kernel#sleep', methods[5].full_name)
+
+    result.eliminate_methods!([/Integer#times/])
+
+    methods = result.threads.first.methods.sort.reverse
+    assert_equal(5, methods.count)
+    assert_equal('MethodEliminationTest#test_methods_can_be_eliminated', methods[0].full_name)
+    assert_equal('<Module::MethodElimination>#a', methods[1].full_name)
+    assert_equal('<Module::MethodElimination>#c', methods[2].full_name)
+    assert_equal('<Module::MethodElimination>#b', methods[3].full_name)
+    assert_equal('Kernel#sleep', methods[4].full_name)
+  end
+
+  private
+
+  def assert_method_has_been_eliminated(result, eliminated_method)
+    result.threads.each do |thread|
+      thread.methods.each do |method|
+        method.call_infos.each do |ci|
+          assert(ci.target != eliminated_method, "broken self")
+          assert(ci.parent.target != eliminated_method, "broken parent") if ci.parent
+          ci.children.each do |callee|
+            assert(callee.target != eliminated_method, "broken kid")
+          end
+        end
+      end
+    end
+  end
+end

data/test/module_test.rb

@@ -1,45 +1,45 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-# Need to use wall time for this test due to the sleep calls
-RubyProf::measure_mode = RubyProf::WALL_TIME
-
-module Foo
-  def Foo::hello
-    sleep(0.5)
-  end
-end
-
-module Bar
-  def Bar::hello
-    sleep(0.5)
-    Foo::hello
-  end
-
-  def hello
-    sleep(0.5)
-    Bar::hello
-  end
-end
-
-include Bar
-
-class ModuleTest < TestCase
-  def test_nested_modules
-    result = RubyProf.profile do
-      hello
-    end
-
-    methods = result.threads.first.methods
-
-    # Length should be 5
-    assert_equal(5, methods.length)
-
-    # these methods should be in there... (hard to tell order though).
-    for name in ['ModuleTest#test_nested_modules','Bar#hello','Kernel#sleep','<Module::Bar>#hello','<Module::Foo>#hello']
-      assert methods.map(&:full_name).include?( name )
-    end
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+# Need to use wall time for this test due to the sleep calls
+RubyProf::measure_mode = RubyProf::WALL_TIME
+
+module Foo
+  def Foo::hello
+    sleep(0.5)
+  end
+end
+
+module Bar
+  def Bar::hello
+    sleep(0.5)
+    Foo::hello
+  end
+
+  def hello
+    sleep(0.5)
+    Bar::hello
+  end
+end
+
+include Bar
+
+class ModuleTest < TestCase
+  def test_nested_modules
+    result = RubyProf.profile do
+      hello
+    end
+
+    methods = result.threads.first.methods
+
+    # Length should be 5
+    assert_equal(5, methods.length)
+
+    # these methods should be in there... (hard to tell order though).
+    for name in ['ModuleTest#test_nested_modules','Bar#hello','Kernel#sleep','<Module::Bar>#hello','<Module::Foo>#hello']
+      assert methods.map(&:full_name).include?( name )
+    end
+  end
+end

data/test/multi_printer_test.rb

@@ -1,104 +1,104 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-# Test data
-#     A
-#    / \
-#   B   C
-#        \
-#         B
-
-class MSTPT
-  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 MultiPrinterTest < 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_refuses_io_objects
-    # we don't need a real profile for this test
-    p = RubyProf::MultiPrinter.new nil
-    begin
-      p.print(STDOUT)
-      flunk "should have raised an ArgumentError"
-    rescue ArgumentError => e
-      assert_match(/IO/, e.to_s)
-    end
-  end
-
-  def test_refuses_non_hashes
-    # we don't need a real profile for this test
-    p = RubyProf::MultiPrinter.new nil
-    begin
-      p.print([])
-      flunk "should have raised an ArgumentError"
-    rescue ArgumentError => e
-      assert_match(/hash/, e.to_s)
-    end
-  end
-
-  def test_all_profiles_can_be_created
-    start_time = Time.now
-    RubyProf.start
-    5.times{MSTPT.new.a}
-    result = RubyProf.stop
-    end_time = Time.now
-    expected_time = end_time - start_time
-    graph = print(result)[1]
-    re = Regexp.new('
-\s*<table>
-\s*<tr>
-\s*<th>Thread ID</th>
-\s*(<th>Fiber ID</th>)?
-\s*<th>Total Time</th>
-\s*</tr>
-\s*
-\s*<tr>
-\s*(<td>([\.0-9]+)</td>)?
-\s*<td><a href="#-?\d+">-?\d+</a></td>
-\s*<td>([\.0-9e]+)</td>
-\s*</tr>
-\s*
-\s*</table>')
-    assert_match(re, graph)
-    graph =~ re
-    display_time = $4.to_f
-    assert_in_delta expected_time, display_time, 0.001
-  end
-
-  private
-
-  def print(result)
-    test = caller.first =~ /in `(.*)'/ ? $1 : "test"
-    path = RubyProf.tmpdir
-    profile = "ruby_prof_#{test}"
-    printer = RubyProf::MultiPrinter.new(result)
-    printer.print(:path => path, :profile => profile,
-                  :threshold => 0, :min_percent => 0, :title => "ruby_prof #{test}")
-    if RUBY_PLATFORM =~ /darwin/ && ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT']=="1"
-      system("open '#{printer.stack_profile}'")
-    end
-    # if GC.respond_to?(:dump_file_and_line_info)
-    #   GC.start
-    #   GC.dump_file_and_line_info("heap.dump")
-    # end
-    [File.read(printer.stack_profile), File.read(printer.graph_profile)]
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+# Test data
+#     A
+#    / \
+#   B   C
+#        \
+#         B
+
+class MSTPT
+  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 MultiPrinterTest < 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_refuses_io_objects
+    # we don't need a real profile for this test
+    p = RubyProf::MultiPrinter.new nil
+    begin
+      p.print(STDOUT)
+      flunk "should have raised an ArgumentError"
+    rescue ArgumentError => e
+      assert_match(/IO/, e.to_s)
+    end
+  end
+
+  def test_refuses_non_hashes
+    # we don't need a real profile for this test
+    p = RubyProf::MultiPrinter.new nil
+    begin
+      p.print([])
+      flunk "should have raised an ArgumentError"
+    rescue ArgumentError => e
+      assert_match(/hash/, e.to_s)
+    end
+  end
+
+  def test_all_profiles_can_be_created
+    start_time = Time.now
+    RubyProf.start
+    5.times{MSTPT.new.a}
+    result = RubyProf.stop
+    end_time = Time.now
+    expected_time = end_time - start_time
+    graph = print(result)[1]
+    re = Regexp.new('
+\s*<table>
+\s*<tr>
+\s*<th>Thread ID</th>
+\s*(<th>Fiber ID</th>)?
+\s*<th>Total Time</th>
+\s*</tr>
+\s*
+\s*<tr>
+\s*(<td>([\.0-9]+)</td>)?
+\s*<td><a href="#-?\d+">-?\d+</a></td>
+\s*<td>([\.0-9e]+)</td>
+\s*</tr>
+\s*
+\s*</table>')
+    assert_match(re, graph)
+    graph =~ re
+    display_time = $4.to_f
+    assert_in_delta expected_time, display_time, 0.001
+  end
+
+  private
+
+  def print(result)
+    test = caller.first =~ /in `(.*)'/ ? $1 : "test"
+    path = RubyProf.tmpdir
+    profile = "ruby_prof_#{test}"
+    printer = RubyProf::MultiPrinter.new(result)
+    printer.print(:path => path, :profile => profile,
+                  :threshold => 0, :min_percent => 0, :title => "ruby_prof #{test}")
+    if RUBY_PLATFORM =~ /darwin/ && ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT']=="1"
+      system("open '#{printer.stack_profile}'")
+    end
+    # if GC.respond_to?(:dump_file_and_line_info)
+    #   GC.start
+    #   GC.dump_file_and_line_info("heap.dump")
+    # end
+    [File.read(printer.stack_profile), File.read(printer.graph_profile)]
+  end
+end