ruby-prof 1.5.0 → 1.6.1

data/test/alias_test.rb

@@ -15,13 +15,8 @@ class AliasTest < TestCase
     end
   end
 
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
   def test_alias
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       TestMe.new.some_method
     end
 
@@ -31,7 +26,7 @@ class AliasTest < TestCase
     # Method 0
     method = methods[0]
     assert_equal('AliasTest#test_alias', method.full_name)
-    assert_equal(25, method.line)
+    assert_equal(20, method.line)
     refute(method.recursive?)
 
     assert_equal(0, method.call_trees.callers.count)
@@ -39,11 +34,11 @@ class AliasTest < TestCase
     assert_equal(2, method.call_trees.callees.count)
     call_tree = method.call_trees.callees[0]
     assert_equal('Class#new', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
+    assert_equal(20, call_tree.line)
 
     call_tree = method.call_trees.callees[1]
     assert_equal('AliasTest::TestMe#some_method', call_tree.target.full_name)
-    assert_equal(25, call_tree.line)
+    assert_equal(20, call_tree.line)
 
     # Method 1
     method = methods[1]
@@ -54,7 +49,7 @@ class AliasTest < TestCase
     assert_equal(1, method.call_trees.callers.count)
     call_tree = method.call_trees.callers[0]
     assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
+    assert_equal(20, call_tree.line)
 
     assert_equal(1, method.call_trees.callees.count)
     call_tree = method.call_trees.callees[0]
@@ -83,7 +78,7 @@ class AliasTest < TestCase
     assert_equal(1, method.call_trees.callers.count)
     call_tree = method.call_trees.callers[0]
     assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
-    assert_equal(25, call_tree.line)
+    assert_equal(20, call_tree.line)
 
     assert_equal(1, method.call_trees.callees.count)
     call_tree = method.call_trees.callees[0]

data/test/call_tree_visitor_test.rb

@@ -5,13 +5,8 @@ require File.expand_path('../test_helper', __FILE__)
 require_relative './measure_times'
 
 class CallTreeVisitorTest < 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_visit
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       RubyProf::C1.sleep_wait
     end
 

data/test/call_trees_test.rb

@@ -13,7 +13,7 @@ class CallTreesTest < TestCase
   end
 
   def test_call_infos
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       some_method_1
     end
 
@@ -51,7 +51,7 @@ class CallTreesTest < TestCase
   end
 
   def test_gc
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       some_method_1
     end
 

data/test/{basic_test.rb → compatibility_test.rb}

@@ -4,12 +4,18 @@
 require File.expand_path('../test_helper', __FILE__)
 require_relative './measure_times'
 
-class BasicTest < TestCase
+class CompatibilityTest < TestCase
   def setup
-    # Need to use wall time for this test due to the sleep calls
+    super
+    Gem::Deprecate.skip = true
     RubyProf::measure_mode = RubyProf::WALL_TIME
   end
 
+  def teardown
+    super
+    Gem::Deprecate.skip = false
+  end
+
   def test_running
     assert(!RubyProf.running?)
     RubyProf.start

data/test/duplicate_names_test.rb

@@ -5,7 +5,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 class DuplicateNamesTest < TestCase
   def test_names
-    result = RubyProf::profile do
+    result = RubyProf::Profile.profile do
       str = %{module Foo; class Bar; def foo; end end end}
 
       eval str

data/test/dynamic_method_test.rb

@@ -24,14 +24,9 @@ class DynamicMethodTest < TestCase
     end
   end
 
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
   def test_dynamic_method
     medley = FruitMedley.new
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       medley.apple
       medley.orange
       medley.banana

data/test/enumerable_test.rb

@@ -8,7 +8,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 class EnumerableTest < TestCase
   def test_enumerable
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       3.times {  [1,2,3].any? {|n| n} }
     end
     methods = if RUBY_VERSION >= "2.2.0"

data/test/exceptions_test.rb

@@ -6,7 +6,7 @@ require File.expand_path('../test_helper', __FILE__)
 class ExceptionsTest < TestCase
   def test_profile
     result = begin
-      RubyProf.profile do
+      RubyProf::Profile.profile do
         raise(RuntimeError, 'Test error')
       end
     rescue
@@ -16,7 +16,7 @@ class ExceptionsTest < TestCase
 
   def test_profile_allows_exceptions
     assert_raises(RuntimeError) do
-      RubyProf.profile(:allow_exceptions => true) do
+      RubyProf::Profile.profile(:allow_exceptions => true) do
         raise(RuntimeError, 'Test error')
       end
     end

data/test/exclude_methods_test.rb

@@ -34,14 +34,9 @@ class ExcludeMethodsClass
 end
 
 class ExcludeMethodsTest < 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_methods_can_be_profiled
     obj = ExcludeMethodsClass.new
-    prf = RubyProf::Profile.new
+    prf = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
 
     result = prf.profile {obj.a}
     methods = result.threads.first.methods.sort.reverse
@@ -102,7 +97,7 @@ class ExcludeMethodsTest < TestCase
 
   def test_exclude_common_methods1
     obj = ExcludeMethodsClass.new
-    prf = RubyProf::Profile.new
+    prf = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
 
     prf.exclude_common_methods!
 
@@ -124,7 +119,7 @@ class ExcludeMethodsTest < TestCase
   def test_exclude_common_methods2
     obj = ExcludeMethodsClass.new
 
-    result = RubyProf.profile(exclude_common: true) { 5.times {obj.a} }
+    result = RubyProf::Profile.profile(exclude_common: true) { 5.times {obj.a} }
     methods = result.threads.first.methods.sort.reverse
 
     assert_equal(9, methods.count)

data/test/exclude_threads_test.rb

@@ -26,15 +26,10 @@ class ExcludeThreadsTest < TestCase
       thread2_proc
     end
 
-    # exclude_threads already includes the minitest thread pool
-    RubyProf.exclude_threads += [ thread2 ]
-
-    RubyProf.start
-
-    thread1.join
-    thread2.join
-
-    result = RubyProf.stop
+    result = RubyProf::Profile.profile(exclude_threads: [thread2]) do
+      thread1.join
+      thread2.join
+    end
 
     assert_equal(2, result.threads.length)
 

data/test/fiber_test.rb

@@ -46,13 +46,8 @@ class FiberTest < TestCase
     fiber.resume
   end
 
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
   def test_fibers
-    result = RubyProf.profile { enumerator_with_fibers }
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) { enumerator_with_fibers }
 
     assert_equal(2, result.threads.size)
 
@@ -142,7 +137,7 @@ class FiberTest < TestCase
   end
 
   def test_fiber_resume
-    result  = RubyProf.profile { fiber_yield_resume }
+    result  = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) { fiber_yield_resume }
 
     assert_equal(2, result.threads.size)
 
@@ -217,7 +212,7 @@ class FiberTest < TestCase
 
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
     def test_times_no_merge
-      result  = RubyProf.profile { concurrency }
+      result  = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) { concurrency }
 
       assert_equal(4, result.threads.size)
 
@@ -230,7 +225,7 @@ class FiberTest < TestCase
     end
 
     def test_times_merge
-      result  = RubyProf.profile { concurrency }
+      result  = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) { concurrency }
       result.merge!
 
       assert_equal(2, result.threads.size)

data/test/gc_test.rb

@@ -6,6 +6,7 @@ Minitest::Test.i_suck_and_my_tests_are_order_dependent!
 
 class GcTest < TestCase
   def setup
+    super
     GC.stress = true
   end
 
@@ -18,7 +19,7 @@ class GcTest < TestCase
   end
 
   def run_profile
-    RubyProf.profile do
+    RubyProf::Profile.profile do
       self.some_method
     end
   end

data/test/inverse_call_tree_test.rb

@@ -4,18 +4,17 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class InverseCallTreeTest < TestCase
-  INVERSE_DEPTH = 5
-
   def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
+    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
-        RubyProf.start
+        @profile.start
         sleep(sleep_amount)
       end
     else
@@ -31,11 +30,11 @@ class InverseCallTreeTest < TestCase
   def test_inverse
     method_name = "method_#{INVERSE_DEPTH - 1}"
     self.send(method_name.to_sym)
-    profile = RubyProf.stop
+    result = @profile.stop
 
-    assert_equal(1, profile.threads.count)
+    assert_equal(1, result.threads.count)
 
-    thread = profile.threads.first
+    thread = result.threads.first
     assert_in_delta(0.79, thread.total_time, 0.05)
 
     assert_equal(7, thread.methods.length)
@@ -44,29 +43,29 @@ class InverseCallTreeTest < TestCase
     # InverseCallTreeTest#test_inverse
     method = methods[0]
     assert_equal('InverseCallTreeTest#test_inverse', method.full_name)
-    assert_equal(34, method.line)
+    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(26, call_tree.line)
+    assert_equal(25, call_tree.line)
 
     # InverseCallTreeTest#method_4
     method = methods[1]
     assert_equal('InverseCallTreeTest#method_4', method.full_name)
-    assert_equal(26, method.line)
+    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(26, call_tree.line)
+    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(26, call_tree.line)
+    assert_equal(25, call_tree.line)
 
     # Kernel#sleep
     method = methods[2]
@@ -76,100 +75,100 @@ class InverseCallTreeTest < TestCase
     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(19, call_tree.line)
+    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(26, call_tree.line)
+    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(26, call_tree.line)
+    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(26, call_tree.line)
+    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(26, call_tree.line)
+    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(26, method.line)
+    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(26, call_tree.line)
+    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(26, call_tree.line)
+    assert_equal(25, call_tree.line)
 
     call_tree = method.call_trees.callees[1]
     assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(26, call_tree.line)
+    assert_equal(25, call_tree.line)
 
     # InverseCallTreeTest#method_2
     method = methods[4]
     assert_equal('InverseCallTreeTest#method_2', method.full_name)
-    assert_equal(26, method.line)
+    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(26, call_tree.line)
+    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(26, call_tree.line)
+    assert_equal(25, call_tree.line)
 
     call_tree = method.call_trees.callees[1]
     assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(26, call_tree.line)
+    assert_equal(25, call_tree.line)
 
     call_tree = method.call_trees.callees[1]
     assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(26, call_tree.line)
+    assert_equal(25, call_tree.line)
 
     # InverseCallTreeTest#method_1
     method = methods[5]
     assert_equal('InverseCallTreeTest#method_1', method.full_name)
-    assert_equal(26, method.line)
+    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(26, call_tree.line)
+    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(19, call_tree.line)
+    assert_equal(18, call_tree.line)
 
     call_tree = method.call_trees.callees[1]
     assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(26, call_tree.line)
+    assert_equal(25, call_tree.line)
 
     # InverseCallTreeTest#method_0
     method = methods[6]
     assert_equal('InverseCallTreeTest#method_0', method.full_name)
-    assert_equal(19, method.line)
+    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(19, call_tree.line)
+    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(19, call_tree.line)
+    assert_equal(18, call_tree.line)
   end
 end

data/test/line_number_test.rb

@@ -31,7 +31,7 @@ class LineNumbersTest < TestCase
   def test_function_line_no
     numbers = LineNumbers.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       numbers.method_1
     end
 

data/test/marshal_test.rb

@@ -111,7 +111,7 @@ class MarshalTest < TestCase
   end
 
   def test_marshal_1
-    profile_1 = RubyProf.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 +122,7 @@ class MarshalTest < TestCase
   end
 
   def test_marshal_2
-    profile_1 = RubyProf.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
 
@@ -133,7 +133,7 @@ class MarshalTest < TestCase
   end
 
   def test_singleton
-    profile_1 = RubyProf.profile do
+    profile_1 = RubyProf::Profile.profile do
       SingletonTest.instance.busy_wait
     end
 

data/test/measure_allocations_test.rb

@@ -4,18 +4,9 @@
 require File.expand_path('../test_helper', __FILE__)
 require_relative './measure_allocations'
 
-class MeasureAllocationsTraceTest < TestCase
-  def setup
-    RubyProf::measure_mode = RubyProf::ALLOCATIONS
-  end
-
-  def test_allocations_mode
-    RubyProf::measure_mode = RubyProf::ALLOCATIONS
-    assert_equal(RubyProf::ALLOCATIONS, RubyProf::measure_mode)
-  end
-
+class MeasureAllocationsTest < TestCase
   def test_allocations
-    result = RubyProf.profile(:track_allocations => true) do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::ALLOCATIONS, track_allocations: true) do
       allocator = Allocator.new
       allocator.run
     end
@@ -29,7 +20,7 @@ class MeasureAllocationsTraceTest < TestCase
 
       # Method 0
       method = methods[0]
-      assert_equal('MeasureAllocationsTraceTest#test_allocations',  method.full_name)
+      assert_equal('MeasureAllocationsTest#test_allocations',  method.full_name)
       assert_in_delta(20, method.total_time, 1)
       assert_equal(0, method.wait_time)
       assert_equal(0, method.self_time)
@@ -62,7 +53,7 @@ class MeasureAllocationsTraceTest < TestCase
 
       assert_equal(1, method.call_trees.callers.length)
       call_tree = method.call_trees.callers[0]
-      assert_equal('MeasureAllocationsTraceTest#test_allocations', call_tree.parent.target.full_name)
+      assert_equal('MeasureAllocationsTest#test_allocations', call_tree.parent.target.full_name)
       assert_equal(19, call_tree.total_time)
       assert_equal(0, call_tree.wait_time)
       assert_equal(0, call_tree.self_time)
@@ -100,7 +91,7 @@ class MeasureAllocationsTraceTest < TestCase
 
       assert_equal(4, method.call_trees.callers.length)
       call_tree = method.call_trees.callers[0]
-      assert_equal('MeasureAllocationsTraceTest#test_allocations', call_tree.parent.target.full_name)
+      assert_equal('MeasureAllocationsTest#test_allocations', call_tree.parent.target.full_name)
       assert_equal(1, call_tree.total_time)
       assert_equal(0, call_tree.wait_time)
       assert_equal(1, call_tree.self_time)
@@ -335,7 +326,7 @@ class MeasureAllocationsTraceTest < TestCase
 
       # Method 0
       method = methods[0]
-      assert_equal('MeasureAllocationsTraceTest#test_allocations',  method.full_name)
+      assert_equal('MeasureAllocationsTest#test_allocations',  method.full_name)
       assert_in_delta(20, method.total_time, 1)
       assert_equal(0, method.wait_time)
       assert_equal(0, method.self_time)
@@ -368,7 +359,7 @@ class MeasureAllocationsTraceTest < TestCase
 
       assert_equal(1, method.call_trees.callers.length)
       call_tree = method.call_trees.callers[0]
-      assert_equal('MeasureAllocationsTraceTest#test_allocations', call_tree.parent.target.full_name)
+      assert_equal('MeasureAllocationsTest#test_allocations', call_tree.parent.target.full_name)
       assert_equal(19, call_tree.total_time)
       assert_equal(0, call_tree.wait_time)
       assert_equal(0, call_tree.self_time)
@@ -478,7 +469,7 @@ class MeasureAllocationsTraceTest < TestCase
 
       assert_equal(3, method.call_trees.callers.length)
       call_tree = method.call_trees.callers[0]
-      assert_equal('MeasureAllocationsTraceTest#test_allocations', call_tree.parent.target.full_name)
+      assert_equal('MeasureAllocationsTest#test_allocations', call_tree.parent.target.full_name)
       assert_equal(1, call_tree.total_time)
       assert_equal(0, call_tree.wait_time)
       assert_equal(1, call_tree.self_time)

data/test/measure_memory_test.rb

@@ -5,18 +5,9 @@ require File.expand_path('../test_helper', __FILE__)
 require_relative './measure_allocations'
 
 class MeasureMemoryTest < TestCase
-  def setup
-    RubyProf::measure_mode = RubyProf::MEMORY
-  end
-
-  def test_memory_mode
-    RubyProf::measure_mode = RubyProf::MEMORY
-    assert_equal(RubyProf::MEMORY, RubyProf::measure_mode)
-  end
-
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0')
     def test_memory
-      result = RubyProf.profile do
+      result = RubyProf::Profile.profile(measure_mode: RubyProf::MEMORY) do
         allocator = Allocator.new
         allocator.run
       end
@@ -351,7 +342,7 @@ class MeasureMemoryTest < TestCase
     end
   elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2')
     def test_memory
-      result = RubyProf.profile do
+      result = RubyProf::Profile.profile(measure_mode: RubyProf::MEMORY) do
         allocator = Allocator.new
         allocator.run
       end
@@ -686,7 +677,7 @@ class MeasureMemoryTest < TestCase
     end
   else
     def test_memory
-      result = RubyProf.profile do
+      result = RubyProf::Profile.profile(measure_mode: RubyProf::MEMORY) do
         allocator = Allocator.new
         allocator.run
       end