ruby-prof 1.5.0 → 1.6.2

data/test/thread_test.rb

@@ -8,11 +8,6 @@ require_relative './call_tree_builder'
 
 # --  Tests ----
 class ThreadTest < 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_initialize
     method_info = RubyProf::MethodInfo.new(Array, :size)
     call_tree = RubyProf::CallTree.new(method_info)
@@ -22,41 +17,109 @@ class ThreadTest < TestCase
     assert(thread)
     assert(thread.id)
     assert(thread.fiber_id)
+
+    assert_equal(1, thread.methods.size)
+    assert_same(method_info, thread.methods[0])
   end
 
   def test_merge
     call_tree_1 = create_call_tree_1
     thread_1 = RubyProf::Thread.new(call_tree_1, Thread.current, Fiber.current)
+    assert_equal(6, thread_1.methods.size)
 
     call_tree_2 = create_call_tree_2
     thread_2 = RubyProf::Thread.new(call_tree_2, Thread.current, Fiber.current)
+    assert_equal(6, thread_2.methods.size)
 
     thread_1.merge!(thread_2)
-    assert_in_delta(11.6, thread_1.call_tree.total_time, 0.00001)
-    assert_in_delta(0, thread_1.call_tree.self_time, 0.00001)
-    assert_in_delta(0.0, thread_1.call_tree.wait_time, 0.00001)
-    assert_in_delta(11.6, thread_1.call_tree.children_time, 0.00001)
+    assert_equal(7, thread_1.methods.size)
+
+    # Method times
+    assert_in_delta(11.6, thread_1.methods[0].total_time, 0.00001) # root
+    assert_in_delta(4.1, thread_1.methods[1].total_time, 0.00001)  # a
+    assert_in_delta(1.5, thread_1.methods[2].total_time, 0.00001)  # aa
+    assert_in_delta(2.6, thread_1.methods[3].total_time, 0.00001)  # ab
+    assert_in_delta(7.5, thread_1.methods[4].total_time, 0.00001)  # b
+    assert_in_delta(6.6, thread_1.methods[5].total_time, 0.00001)  # bb
+    assert_in_delta(0.9, thread_1.methods[6].total_time, 0.00001)  # ba
+
+    # Root
+    call_tree = call_tree_1
+    assert_equal(:root, call_tree.target.method_name)
+    assert_in_delta(11.6, call_tree.total_time, 0.00001)
+    assert_in_delta(0, call_tree.self_time, 0.00001)
+    assert_in_delta(0.0, call_tree.wait_time, 0.00001)
+    assert_in_delta(11.6, call_tree.children_time, 0.00001)
+
+    # a
+    call_tree = call_tree_1.children[0]
+    assert_equal(:a, call_tree.target.method_name)
+    assert_in_delta(4.1, call_tree.total_time, 0.00001)
+    assert_in_delta(0, call_tree.self_time, 0.00001)
+    assert_in_delta(0.0, call_tree.wait_time, 0.00001)
+    assert_in_delta(4.1, call_tree.children_time, 0.00001)
+
+    # aa
+    call_tree = call_tree_1.children[0].children[0]
+    assert_equal(:aa, call_tree.target.method_name)
+    assert_in_delta(1.5, call_tree.total_time, 0.00001)
+    assert_in_delta(1.5, call_tree.self_time, 0.00001)
+    assert_in_delta(0.0, call_tree.wait_time, 0.00001)
+    assert_in_delta(0.0, call_tree.children_time, 0.00001)
+
+    # ab
+    call_tree = call_tree_1.children[0].children[1]
+    assert_equal(:ab, call_tree.target.method_name)
+    assert_in_delta(2.6, call_tree.total_time, 0.00001)
+    assert_in_delta(2.6, call_tree.self_time, 0.00001)
+    assert_in_delta(0.0, call_tree.wait_time, 0.00001)
+    assert_in_delta(0.0, call_tree.children_time, 0.00001)
+
+    # # b
+    # call_tree = call_tree_1.children[1]
+    # assert_equal(:b, call_tree.target.method_name)
+    # assert_in_delta(7.5, call_tree.total_time, 0.00001)
+    # assert_in_delta(0, call_tree.self_time, 0.00001)
+    # assert_in_delta(0.0, call_tree.wait_time, 0.00001)
+    # assert_in_delta(7.5, call_tree.children_time, 0.00001)
+
+    # bb
+    # call_tree = call_tree_1.children[1].children[0]
+    # assert_equal(:bb, call_tree.target.method_name)
+    # assert_in_delta(6.6, call_tree.total_time, 0.00001)
+    # assert_in_delta(6.6, call_tree.self_time, 0.00001)
+    # assert_in_delta(0.0, call_tree.wait_time, 0.00001)
+    # assert_in_delta(0.0, call_tree.children_time, 0.00001)
+
+    # ba
+    call_tree = call_tree_1.children[1].children[1]
+    assert_equal(:ba, call_tree.target.method_name)
+    assert_in_delta(0.9, call_tree.total_time, 0.00001)
+    assert_in_delta(0.7, call_tree.self_time, 0.00001)
+    assert_in_delta(0.2, call_tree.wait_time, 0.00001)
+    assert_in_delta(0.0, call_tree.children_time, 0.00001)
   end
 
   def test_thread_count
-    RubyProf.start
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+      thread = Thread.new do
+        sleep(1)
+      end
 
-    thread = Thread.new do
-      sleep(1)
+      thread.join
     end
-
-    thread.join
-    result = RubyProf.stop
     assert_equal(2, result.threads.length)
   end
 
   def test_thread_identity
-    RubyProf.start
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
+    profile.start
+
     sleep_thread = Thread.new do
       sleep(1)
     end
     sleep_thread.join
-    result = RubyProf.stop
+    result = profile.stop
 
     thread_ids = result.threads.map {|thread| thread.id}.sort
     threads = [Thread.current, sleep_thread]
@@ -73,7 +136,9 @@ class ThreadTest < TestCase
   end
 
   def test_thread_timings
-    RubyProf.start
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
+    profile.start
+
     thread = Thread.new do
       sleep 0
       # force it to hit thread.join, below, first
@@ -83,7 +148,7 @@ class ThreadTest < TestCase
       sleep(1)
     end
     thread.join
-    result = RubyProf.stop
+    result = profile.stop
 
     # Check background thread
     assert_equal(2, result.threads.length)

data/test/unique_call_path_test.rb

@@ -30,7 +30,7 @@ class UniqueCallPathTest < TestCase
   def test_root
     unique_call_path = UniqueCallPath.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       unique_call_path.method_a(1)
     end
 
@@ -41,7 +41,7 @@ class UniqueCallPathTest < TestCase
   def test_root_children
     unique_call_path = UniqueCallPath.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       unique_call_path.method_a(1)
       unique_call_path.method_k(2)
     end
@@ -59,7 +59,7 @@ class UniqueCallPathTest < TestCase
   def test_children_of
     unique_call_path = UniqueCallPath.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       unique_call_path.method_a(1)
       unique_call_path.method_k(2)
     end
@@ -92,7 +92,7 @@ class UniqueCallPathTest < TestCase
   def test_unique_path
     unique_call_path = UniqueCallPath.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       unique_call_path.method_a(1)
       unique_call_path.method_k(1)
     end

data/test/yarv_test.rb

@@ -6,13 +6,13 @@ require File.expand_path('../test_helper', __FILE__)
 # tests for bugs reported by users
 class YarvTest < TestCase
   def setup
-    RubyProf::measure_mode = RubyProf::WALL_TIME
+    super
     define_methods
   end
 
   def test_array_push_unoptimized
     a = nil
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       a = self.array_push_unoptimized
     end
     assert_equal 2, a.length
@@ -21,7 +21,7 @@ class YarvTest < TestCase
 
   def test_array_push_optimized
     a = nil
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       a = self.array_push_optimized
     end
     assert_equal(2, a.length)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -112,11 +112,11 @@ files:
 - ruby-prof.gemspec
 - test/abstract_printer_test.rb
 - test/alias_test.rb
-- test/basic_test.rb
 - test/call_tree_builder.rb
 - test/call_tree_test.rb
 - test/call_tree_visitor_test.rb
 - test/call_trees_test.rb
+- test/compatibility_test.rb
 - test/duplicate_names_test.rb
 - test/dynamic_method_test.rb
 - test/enumerable_test.rb
@@ -135,6 +135,7 @@ files:
 - test/measure_times.rb
 - test/measure_wall_time_test.rb
 - test/measurement_test.rb
+- test/merge_test.rb
 - test/method_info_test.rb
 - test/multi_printer_test.rb
 - test/no_method_class_test.rb
@@ -166,7 +167,7 @@ metadata:
   bug_tracker_uri: https://github.com/ruby-prof/ruby-prof/issues
   changelog_uri: https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES
   documentation_uri: https://ruby-prof.github.io/
-  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.5.0
+  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.6.2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Fast Ruby profiler