ruby-prof 1.7.2 → 2.0.0

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

@@ -1,145 +1,144 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path("../test_helper", __FILE__)
-class MarshalTest < TestCase
-  def verify_profile(profile_1, profile_2)
-    verify_threads(profile_1.threads, profile_2.threads)
-    assert_equal(profile_1.measure_mode, profile_2.measure_mode)
-    assert_equal(profile_1.track_allocations?, profile_2.track_allocations?)
-  end
-
-  def verify_threads(threads_1, threads_2)
-    assert_equal(threads_1.count, threads_2.count)
-    threads_1.count.times do |i|
-      thread_1 = threads_1[i]
-      thread_2 = threads_2[i]
-      assert_nil(thread_2.id)
-      assert_equal(thread_1.fiber_id, thread_2.fiber_id)
-      verify_call_info(thread_1.call_tree, thread_2.call_tree)
-
-      verify_methods(thread_1.methods, thread_2.methods)
-    end
-  end
-
-  def verify_methods(methods_1, methods_2)
-    assert_equal(methods_1.count, methods_2.count)
-
-    methods_1.count.times do |i|
-      method_1 = methods_1[i]
-      method_2 = methods_2[i]
-
-      assert_equal(method_1.klass_name, method_2.klass_name)
-      assert_equal(method_1.klass_flags, method_2.klass_flags)
-
-      assert_equal(method_1.method_name, method_2.method_name)
-      assert_equal(method_1.full_name, method_2.full_name)
-
-      assert_equal(method_1.recursive?, method_2.recursive?)
-
-      if method_1.source_file
-        assert_equal(method_1.source_file, method_2.source_file)
-      else
-        assert_nil(method_1.source_file)
-        assert_nil(method_2.source_file)
-      end
-
-      assert_equal(method_1.line, method_2.line)
-
-      verify_measurement(method_1.measurement, method_2.measurement)
-      verify_call_infos(method_1.call_trees, method_2.call_trees)
-      verify_allocations(method_1.allocations, method_2.allocations)
-    end
-  end
-
-  def verify_allocations(allocations_1, allocations_2)
-    assert_equal(allocations_1.count, allocations_2.count)
-
-    allocations_1.count.times do |i|
-      allocation_1 = allocations_1[i]
-      allocation_2 = allocations_2[i]
-
-      assert_equal(allocation_1.klass_name, allocation_2.klass_name)
-      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)
-    end
-  end
-
-  def verify_call_infos(call_infos_1, call_infos_2)
-    assert_equal(call_infos_1.call_trees.count, call_infos_2.call_trees.count)
-    call_infos_1.call_trees.count.times do |i|
-      call_info_1 = call_infos_1.call_trees[i]
-      call_info_2 = call_infos_2.call_trees[i]
-      verify_call_info(call_info_1, call_info_2)
-    end
-  end
-
-  def verify_call_info(call_info_1, call_info_2)
-    assert_equal(call_info_1.target, call_info_2.target)
-
-    if call_info_1.parent&.target
-      assert_equal(call_info_1.parent&.target, call_info_2.parent&.target)
-    else
-      assert_nil(call_info_1.parent&.target)
-      assert_nil(call_info_2.parent&.target)
-    end
-
-    assert_equal(call_info_1.depth, call_info_2.depth)
-
-    if call_info_1.source_file
-      assert_equal(call_info_1.source_file, call_info_2.source_file) #
-    else
-      assert_nil(call_info_1.source_file)
-      assert_nil(call_info_2.source_file)
-    end
-
-    assert_equal(call_info_1.line, call_info_2.line)
-
-    verify_measurement(call_info_1.measurement, call_info_2.measurement)
-  end
-
-  def verify_measurement(measurement_1, measurement_2)
-    assert_equal(measurement_1.total_time, measurement_2.total_time)
-    assert_equal(measurement_1.self_time, measurement_2.self_time)
-    assert_equal(measurement_1.wait_time, measurement_2.wait_time)
-    assert_equal(measurement_1.called, measurement_2.called)
-  end
-
-  def test_marshal_1
-    profile_1 = RubyProf::Profile.profile(:measure_mode => RubyProf::WALL_TIME) do
-      1.times { RubyProf::C1.new.sleep_wait }
-    end
-
-    data = Marshal.dump(profile_1)
-    profile_2 = Marshal.load(data)
-
-    verify_profile(profile_1, profile_2)
-  end
-
-  def test_marshal_2
-    profile_1 = RubyProf::Profile.profile(:measure_mode => RubyProf::PROCESS_TIME, :track_allocations => true) do
-      1.times { RubyProf::C1.new.sleep_wait }
-    end
-
-    data = Marshal.dump(profile_1)
-    profile_2 = Marshal.load(data)
-
-    verify_profile(profile_1, profile_2)
-  end
-
-  def test_singleton
-    profile_1 = RubyProf::Profile.profile do
-      SingletonTest.instance.busy_wait
-    end
-
-    data = Marshal.dump(profile_1)
-    profile_2 = Marshal.load(data)
-
-    verify_profile(profile_1, profile_2)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path("../test_helper", __FILE__)
+class MarshalTest < TestCase
+  def verify_profile(profile_1, profile_2)
+    verify_threads(profile_1.threads, profile_2.threads)
+    assert_equal(profile_1.measure_mode, profile_2.measure_mode)
+    assert_equal(profile_1.track_allocations?, profile_2.track_allocations?)
+  end
+
+  def verify_threads(threads_1, threads_2)
+    assert_equal(threads_1.count, threads_2.count)
+    threads_1.count.times do |i|
+      thread_1 = threads_1[i]
+      thread_2 = threads_2[i]
+      assert_nil(thread_2.id)
+      assert_equal(thread_1.fiber_id, thread_2.fiber_id)
+      verify_call_info(thread_1.call_tree, thread_2.call_tree)
+
+      verify_methods(thread_1.methods, thread_2.methods)
+    end
+  end
+
+  def verify_methods(methods_1, methods_2)
+    assert_equal(methods_1.count, methods_2.count)
+
+    methods_1.count.times do |i|
+      method_1 = methods_1[i]
+      method_2 = methods_2[i]
+
+      assert_equal(method_1.klass_name, method_2.klass_name)
+      assert_equal(method_1.klass_flags, method_2.klass_flags)
+
+      assert_equal(method_1.method_name, method_2.method_name)
+      assert_equal(method_1.full_name, method_2.full_name)
+
+      assert_equal(method_1.recursive?, method_2.recursive?)
+
+      if method_1.source_file
+        assert_equal(method_1.source_file, method_2.source_file)
+      else
+        assert_nil(method_1.source_file)
+        assert_nil(method_2.source_file)
+      end
+
+      assert_equal(method_1.line, method_2.line)
+
+      verify_measurement(method_1.measurement, method_2.measurement)
+      verify_call_infos(method_1.call_trees, method_2.call_trees)
+      verify_allocations(method_1.allocations, method_2.allocations)
+    end
+  end
+
+  def verify_allocations(allocations_1, allocations_2)
+    assert_equal(allocations_1.count, allocations_2.count)
+
+    allocations_1.count.times do |i|
+      allocation_1 = allocations_1[i]
+      allocation_2 = allocations_2[i]
+
+      assert_equal(allocation_1.klass_name, allocation_2.klass_name)
+      assert_equal(allocation_1.klass_flags, allocation_2.klass_flags)
+
+      assert_equal(allocation_1.count, allocation_2.count)
+
+      assert_equal(allocation_1.source_file, allocation_2.source_file)
+      assert_equal(allocation_1.line, allocation_2.line)
+    end
+  end
+
+  def verify_call_infos(call_infos_1, call_infos_2)
+    assert_equal(call_infos_1.call_trees.count, call_infos_2.call_trees.count)
+    call_infos_1.call_trees.count.times do |i|
+      call_info_1 = call_infos_1.call_trees[i]
+      call_info_2 = call_infos_2.call_trees[i]
+      verify_call_info(call_info_1, call_info_2)
+    end
+  end
+
+  def verify_call_info(call_info_1, call_info_2)
+    assert_equal(call_info_1.target, call_info_2.target)
+
+    if call_info_1.parent&.target
+      assert_equal(call_info_1.parent&.target, call_info_2.parent&.target)
+    else
+      assert_nil(call_info_1.parent&.target)
+      assert_nil(call_info_2.parent&.target)
+    end
+
+    assert_equal(call_info_1.depth, call_info_2.depth)
+
+    if call_info_1.source_file
+      assert_equal(call_info_1.source_file, call_info_2.source_file) #
+    else
+      assert_nil(call_info_1.source_file)
+      assert_nil(call_info_2.source_file)
+    end
+
+    assert_equal(call_info_1.line, call_info_2.line)
+
+    verify_measurement(call_info_1.measurement, call_info_2.measurement)
+  end
+
+  def verify_measurement(measurement_1, measurement_2)
+    assert_equal(measurement_1.total_time, measurement_2.total_time)
+    assert_equal(measurement_1.self_time, measurement_2.self_time)
+    assert_equal(measurement_1.wait_time, measurement_2.wait_time)
+    assert_equal(measurement_1.called, measurement_2.called)
+  end
+
+  def test_marshal_1
+    profile_1 = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+      1.times { RubyProf::C1.new.sleep_wait }
+    end
+
+    data = Marshal.dump(profile_1)
+    profile_2 = Marshal.load(data)
+
+    verify_profile(profile_1, profile_2)
+  end
+
+  def test_marshal_2
+    profile_1 = RubyProf::Profile.profile(measure_mode: RubyProf::PROCESS_TIME, track_allocations: true) do
+      1.times { RubyProf::C1.new.sleep_wait }
+    end
+
+    data = Marshal.dump(profile_1)
+    profile_2 = Marshal.load(data)
+
+    verify_profile(profile_1, profile_2)
+  end
+
+  def test_singleton
+    profile_1 = RubyProf::Profile.profile do
+      SingletonTest.instance.busy_wait
+    end
+
+    data = Marshal.dump(profile_1)
+    profile_2 = Marshal.load(data)
+
+    verify_profile(profile_1, profile_2)
+  end
+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