ruby-prof 1.7.2 → 2.0.1

data/test/inverse_call_tree_test.rb

@@ -1,174 +1,174 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class InverseCallTreeTest < TestCase
-  def setup
-    super
-    @profile = RubyProf::Profile.new
-  end
-  INVERSE_DEPTH = 5
-
-  INVERSE_DEPTH.times do |i|
-    if i == 0
-      define_method("method_#{i}") do
-        sleep_amount = (i + 1) * 0.05
-        @profile.start
-        sleep(sleep_amount)
-      end
-    else
-      define_method("method_#{i}") do
-        method_name = "method_#{i-1}"
-        sleep_amount = (i + 1) * 0.05
-        self.send(method_name.to_sym)
-        sleep(sleep_amount)
-      end
-    end
-  end
-
-  def test_inverse
-    method_name = "method_#{INVERSE_DEPTH - 1}"
-    self.send(method_name.to_sym)
-    result = @profile.stop
-
-    assert_equal(1, result.threads.count)
-
-    thread = result.threads.first
-    assert_in_delta(0.79, thread.total_time, 0.05)
-
-    assert_equal(7, thread.methods.length)
-    methods = thread.methods.sort.reverse
-
-    # InverseCallTreeTest#test_inverse
-    method = methods[0]
-    assert_equal('InverseCallTreeTest#test_inverse', method.full_name)
-    assert_equal(33, method.line)
-
-    assert_equal(0, method.call_trees.callers.count)
-
-    assert_equal(1, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('InverseCallTreeTest#method_4', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    # InverseCallTreeTest#method_4
-    method = methods[1]
-    assert_equal('InverseCallTreeTest#method_4', method.full_name)
-    assert_equal(25, method.line)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('InverseCallTreeTest#test_inverse', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    assert_equal(2, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('InverseCallTreeTest#method_3', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    # Kernel#sleep
-    method = methods[2]
-    assert_equal('Kernel#sleep', method.full_name)
-    assert_equal(0, method.line)
-
-    assert_equal(5, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('InverseCallTreeTest#method_0', call_tree.parent.target.full_name)
-    assert_equal(18, call_tree.line)
-
-    call_tree = method.call_trees.callers[1]
-    assert_equal('InverseCallTreeTest#method_1', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    call_tree = method.call_trees.callers[2]
-    assert_equal('InverseCallTreeTest#method_2', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
-    call_tree = method.call_trees.callers[3]
-
-    assert_equal('InverseCallTreeTest#method_3', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    call_tree = method.call_trees.callers[4]
-    assert_equal('InverseCallTreeTest#method_4', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    assert_equal(0, method.call_trees.callees.count)
-
-    # InverseCallTreeTest#method_3
-    method = methods[3]
-    assert_equal('InverseCallTreeTest#method_3', method.full_name)
-    assert_equal(25, method.line)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('InverseCallTreeTest#method_4', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    assert_equal(2, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('InverseCallTreeTest#method_2', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    call_tree = method.call_trees.callees[1]
-    assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    # InverseCallTreeTest#method_2
-    method = methods[4]
-    assert_equal('InverseCallTreeTest#method_2', method.full_name)
-    assert_equal(25, method.line)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('InverseCallTreeTest#method_3', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    assert_equal(2, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('InverseCallTreeTest#method_1', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    call_tree = method.call_trees.callees[1]
-    assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    call_tree = method.call_trees.callees[1]
-    assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    # InverseCallTreeTest#method_1
-    method = methods[5]
-    assert_equal('InverseCallTreeTest#method_1', method.full_name)
-    assert_equal(25, method.line)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('InverseCallTreeTest#method_2', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    assert_equal(2, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('InverseCallTreeTest#method_0', call_tree.target.full_name)
-    assert_equal(18, call_tree.line)
-
-    call_tree = method.call_trees.callees[1]
-    assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
-
-    # InverseCallTreeTest#method_0
-    method = methods[6]
-    assert_equal('InverseCallTreeTest#method_0', method.full_name)
-    assert_equal(18, method.line)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('InverseCallTreeTest#method_1', call_tree.parent.target.full_name)
-    assert_equal(18, call_tree.line)
-
-    assert_equal(1, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(18, call_tree.line)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class InverseCallTreeTest < TestCase
+  def setup
+    super
+    @profile = RubyProf::Profile.new
+  end
+  INVERSE_DEPTH = 5
+
+  INVERSE_DEPTH.times do |i|
+    if i == 0
+      define_method("method_#{i}") do
+        sleep_amount = (i + 1) * 0.05
+        @profile.start
+        sleep(sleep_amount)
+      end
+    else
+      define_method("method_#{i}") do
+        method_name = "method_#{i-1}"
+        sleep_amount = (i + 1) * 0.05
+        self.send(method_name.to_sym)
+        sleep(sleep_amount)
+      end
+    end
+  end
+
+  def test_inverse
+    method_name = "method_#{INVERSE_DEPTH - 1}"
+    self.send(method_name.to_sym)
+    result = @profile.stop
+
+    assert_equal(1, result.threads.count)
+
+    thread = result.threads.first
+    assert_in_delta(0.79, thread.total_time, 0.1 * delta_multiplier)
+
+    assert_equal(7, thread.methods.length)
+    methods = thread.methods.sort.reverse
+
+    # InverseCallTreeTest#test_inverse
+    method = methods[0]
+    assert_equal('InverseCallTreeTest#test_inverse', method.full_name)
+    assert_equal(33, method.line)
+
+    assert_equal(0, method.call_trees.callers.count)
+
+    assert_equal(1, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('InverseCallTreeTest#method_4', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    # InverseCallTreeTest#method_4
+    method = methods[1]
+    assert_equal('InverseCallTreeTest#method_4', method.full_name)
+    assert_equal(25, method.line)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('InverseCallTreeTest#test_inverse', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(2, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('InverseCallTreeTest#method_3', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    # Kernel#sleep
+    method = methods[2]
+    assert_equal('Kernel#sleep', method.full_name)
+    assert_equal(0, method.line)
+
+    assert_equal(5, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('InverseCallTreeTest#method_0', call_tree.parent.target.full_name)
+    assert_equal(18, call_tree.line)
+
+    call_tree = method.call_trees.callers[1]
+    assert_equal('InverseCallTreeTest#method_1', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    call_tree = method.call_trees.callers[2]
+    assert_equal('InverseCallTreeTest#method_2', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+    call_tree = method.call_trees.callers[3]
+
+    assert_equal('InverseCallTreeTest#method_3', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    call_tree = method.call_trees.callers[4]
+    assert_equal('InverseCallTreeTest#method_4', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(0, method.call_trees.callees.count)
+
+    # InverseCallTreeTest#method_3
+    method = methods[3]
+    assert_equal('InverseCallTreeTest#method_3', method.full_name)
+    assert_equal(25, method.line)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('InverseCallTreeTest#method_4', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(2, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('InverseCallTreeTest#method_2', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    # InverseCallTreeTest#method_2
+    method = methods[4]
+    assert_equal('InverseCallTreeTest#method_2', method.full_name)
+    assert_equal(25, method.line)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('InverseCallTreeTest#method_3', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(2, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('InverseCallTreeTest#method_1', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    # InverseCallTreeTest#method_1
+    method = methods[5]
+    assert_equal('InverseCallTreeTest#method_1', method.full_name)
+    assert_equal(25, method.line)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('InverseCallTreeTest#method_2', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(2, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('InverseCallTreeTest#method_0', call_tree.target.full_name)
+    assert_equal(18, call_tree.line)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    # InverseCallTreeTest#method_0
+    method = methods[6]
+    assert_equal('InverseCallTreeTest#method_0', method.full_name)
+    assert_equal(18, method.line)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('InverseCallTreeTest#method_1', call_tree.parent.target.full_name)
+    assert_equal(18, call_tree.line)
+
+    assert_equal(1, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(18, call_tree.line)
+  end
+end

data/test/line_number_test.rb

@@ -285,7 +285,7 @@ class LineNumbersTest < TestCase
       assert_equal('LineNumbers#method_1', call_tree.target.full_name)
       assert_equal(140, call_tree.line)
     end
-  else
+  elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('4.0')
     def test_function_line_no
       numbers = LineNumbers.new
 
@@ -422,5 +422,142 @@ class LineNumbersTest < TestCase
       assert_equal('LineNumbers#method_1', call_tree.target.full_name)
       assert_equal(293, call_tree.line)
     end
+  else
+    def test_function_line_no
+      numbers = LineNumbers.new
+
+      result = RubyProf::Profile.profile do
+        numbers.method_1
+      end
+
+      # Sort methods by name to have stable results
+      methods = result.threads.first.methods.sort_by(&:full_name)
+      assert_equal(8, methods.length)
+
+      # Method 0
+      method = methods[0]
+      assert_equal('Integer#<', method.full_name)
+      assert_equal(0, method.line)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Integer#times', call_tree.parent.target.full_name)
+      assert_equal(261, call_tree.line)
+
+      assert_equal(0, method.call_trees.callees.count)
+
+      # Method 1
+      method = methods[1]
+      assert_equal('Integer#succ', method.full_name)
+      assert_equal(0, method.line)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Integer#times', call_tree.parent.target.full_name)
+      assert_equal(263, call_tree.line)
+
+      assert_equal(0, method.call_trees.callees.count)
+
+      # Method 2
+      method = methods[2]
+      assert_equal('Integer#times', method.full_name)
+      assert_equal(255, method.line)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('LineNumbers#method_2', call_tree.parent.target.full_name)
+      assert_equal(15, call_tree.line)
+
+      assert_equal(3, method.call_trees.callees.count)
+
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Integer#<', call_tree.target.full_name)
+      assert_equal(261, call_tree.line)
+
+      call_tree = method.call_trees.callees[1]
+      assert_equal('LineNumbers#method_3', call_tree.target.full_name)
+      assert_equal(17, call_tree.line)
+
+      call_tree = method.call_trees.callees[2]
+      assert_equal('Integer#succ', call_tree.target.full_name)
+      assert_equal(263, call_tree.line)
+
+      # Method 3
+      method = methods[3]
+      assert_equal('LineNumbers#method_1', method.full_name)
+      assert_equal(7, method.line)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('LineNumbersTest#test_function_line_no', call_tree.parent.target.full_name)
+      assert_equal(430, call_tree.line)
+
+      assert_equal(2, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('LineNumbers#method_2', call_tree.target.full_name)
+      assert_equal(8, call_tree.line)
+
+      call_tree = method.call_trees.callees[1]
+      assert_equal('LineNumbers#method_3', call_tree.target.full_name)
+      assert_equal(10, call_tree.line)
+
+      # Method 4
+      method = methods[4]
+      assert_equal('LineNumbers#method_2', method.full_name)
+      assert_equal(13, method.line)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('LineNumbers#method_1', call_tree.parent.target.full_name)
+      assert_equal(8, call_tree.line)
+
+      assert_equal(1, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Integer#times', call_tree.target.full_name)
+      assert_equal(15, call_tree.line)
+
+      # Method 5
+      method = methods[5]
+      assert_equal('LineNumbers#method_3', method.full_name)
+      assert_equal(21, method.line)
+
+      assert_equal(2, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Integer#times', call_tree.parent.target.full_name)
+      assert_equal(17, call_tree.line)
+
+      call_tree = method.call_trees.callers[1]
+      assert_equal('LineNumbers#method_1', call_tree.parent.target.full_name)
+      assert_equal(10, call_tree.line)
+
+      assert_equal(1, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('LineNumbers#method_4', call_tree.target.full_name)
+      assert_equal(22, call_tree.line)
+
+      # Method 6
+      method = methods[6]
+      assert_equal('LineNumbers#method_4', method.full_name)
+      assert_equal(25, method.line)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('LineNumbers#method_3', call_tree.parent.target.full_name)
+      assert_equal(22, call_tree.line)
+
+      assert_equal(0, method.call_trees.callees.count)
+
+      # Method 7
+      method = methods[7]
+      assert_equal('LineNumbersTest#test_function_line_no', method.full_name)
+      assert_equal(430, method.line)
+
+      assert_equal(0, method.call_trees.callers.count)
+
+      assert_equal(1, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('LineNumbers#method_1', call_tree.target.full_name)
+      assert_equal(430, call_tree.line)
+    end
   end
 end

data/test/marshal_test.rb

@@ -63,7 +63,6 @@ class MarshalTest < TestCase
       assert_equal(allocation_1.klass_flags, allocation_2.klass_flags)
 
       assert_equal(allocation_1.count, allocation_2.count)
-      assert_equal(allocation_1.memory, allocation_2.memory)
 
       assert_equal(allocation_1.source_file, allocation_2.source_file)
       assert_equal(allocation_1.line, allocation_2.line)
@@ -111,7 +110,7 @@ class MarshalTest < TestCase
   end
 
   def test_marshal_1
-    profile_1 = RubyProf::Profile.profile(:measure_mode => RubyProf::WALL_TIME) do
+    profile_1 = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       1.times { RubyProf::C1.new.sleep_wait }
     end
 
@@ -122,7 +121,7 @@ class MarshalTest < TestCase
   end
 
   def test_marshal_2
-    profile_1 = RubyProf::Profile.profile(:measure_mode => RubyProf::PROCESS_TIME, :track_allocations => true) do
+    profile_1 = RubyProf::Profile.profile(measure_mode: RubyProf::PROCESS_TIME, track_allocations: true) do
       1.times { RubyProf::C1.new.sleep_wait }
     end
 

data/test/measure_allocations.rb

@@ -1,26 +1,26 @@
-# Some classes used in measurement tests
-class Allocator
-  def make_arrays
-    10.times {|i| Array.new}
-  end
-
-  def make_hashes
-    Hash.new
-    Hash.new
-    Hash.new
-    Hash.new
-    Hash.new
-  end
-
-  def make_strings
-    a_string = 'a'
-    b_string = a_string * 100
-    String.new(b_string)
-  end
-
-  def run
-    make_arrays
-    make_hashes
-    make_strings
-  end
-end
+# Some classes used in measurement tests
+class Allocator
+  def make_arrays
+    10.times {|i| Array.new}
+  end
+
+  def make_hashes
+    Hash.new
+    Hash.new
+    Hash.new
+    Hash.new
+    Hash.new
+  end
+
+  def make_strings
+    a_string = 'a'
+    b_string = a_string * 100
+    String.new(b_string)
+  end
+
+  def run
+    make_arrays
+    make_hashes
+    make_strings
+  end
+end