ruby-prof 1.4.3 → 1.6.3

data/test/fiber_test.rb

@@ -8,7 +8,6 @@ require 'set'
 
 # --  Tests ----
 class FiberTest < TestCase
-
   def enumerator_with_fibers
     enum = Enumerator.new do |yielder|
       [1,2].each do |x|
@@ -30,13 +29,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)
 
@@ -47,46 +41,86 @@ class FiberTest < TestCase
     method = methods[0]
     assert_equal('FiberTest#test_fibers', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[1]
     assert_equal('FiberTest#enumerator_with_fibers', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[2]
     assert_equal('Enumerator#next', method.full_name)
     assert_equal(2, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[3]
     assert_equal('Class#new', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[4]
     assert_equal('Enumerator#initialize', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     thread2 = result.threads[1]
     methods = thread2.methods.sort.reverse
     assert_equal(4, methods.count)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[0]
     assert_equal('Enumerator#each', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[1]
     assert_equal('Enumerator::Generator#each', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[2]
     assert_equal('Array#each', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[3]
     assert_equal('Enumerator::Yielder#yield', method.full_name)
     assert_equal(2, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
   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)
 
@@ -97,33 +131,65 @@ class FiberTest < TestCase
     method = methods[0]
     assert_equal('FiberTest#test_fiber_resume', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[1]
     assert_equal('FiberTest#fiber_yield_resume', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[2]
     assert_equal('Fiber#resume', method.full_name)
     assert_equal(2, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[3]
     assert_equal('Class#new', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[4]
     assert_equal('Fiber#initialize', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     thread1 = result.threads[1]
     methods = thread1.methods.sort.reverse
     assert_equal(2, methods.count)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[0]
     assert_equal('FiberTest#fiber_yield_resume', method.full_name)
     assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
 
     method = methods[1]
     assert_equal('<Class::Fiber>#yield', method.full_name)
     assert_equal(2, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
   end
 end

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
@@ -36,7 +37,6 @@ class GcTest < TestCase
     end
   end
 
-
   def test_hold_onto_method
     methods = 5.times.reduce(Array.new) do |array, i|
       profile = run_profile
@@ -67,16 +67,18 @@ class GcTest < TestCase
   end
 
   def test_hold_onto_measurements
-    measurements = 5.times.reduce(Array.new) do |array, i|
-      profile = run_profile
-      measurements_2 = profile.threads.map(&:methods).flatten.map(&:measurement)
-      array.concat(measurements_2)
-      array
-    end
+    # Run a profile
+    profile = run_profile
+
+    # Get measurement objects
+    measurements = profile.threads.map(&:methods).flatten.map(&:measurement)
+
+    # Free the profiles which frees the measurements
+    profile = nil
 
     GC.start
 
-    measurements.each do |measurement|
+    measurements.each_with_index do |measurement|
       error = assert_raises(RuntimeError) do
         measurement.total_time
       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

@@ -19,12 +19,10 @@ class LineNumbers
   end
 
   def method_3
-    sleep(0.3)
     method_4
   end
 
   def method_4
-    sleep(1.2)
   end
 end
 
@@ -33,24 +31,28 @@ class LineNumbersTest < TestCase
   def test_function_line_no
     numbers = LineNumbers.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       numbers.method_1
     end
 
-    methods = result.threads.first.methods.sort.reverse
-    assert_equal(7, methods.length)
+    # Sort methods by name to have stable results
+    methods = result.threads.first.methods.sort_by(&:full_name)
+    assert_equal(6, methods.length)
 
     # Method 0
     method = methods[0]
-    assert_equal('LineNumbersTest#test_function_line_no', method.full_name)
-    assert_equal(37, method.line)
+    assert_equal('Integer#times', method.full_name)
+    assert_equal(0, method.line)
 
-    assert_equal(0, method.call_trees.callers.count)
+    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(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(37, call_tree.line)
+    assert_equal('LineNumbers#method_3', call_tree.target.full_name)
+    assert_equal(17, call_tree.line)
 
     # Method 1
     method = methods[1]
@@ -60,7 +62,7 @@ class LineNumbersTest < TestCase
     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(37, call_tree.line)
+    assert_equal(35, call_tree.line)
 
     assert_equal(2, method.call_trees.callees.count)
     call_tree = method.call_trees.callees[0]
@@ -73,6 +75,21 @@ class LineNumbersTest < TestCase
 
     # Method 2
     method = methods[2]
+    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 3
+    method = methods[3]
     assert_equal('LineNumbers#method_3', method.full_name)
     assert_equal(21, method.line)
 
@@ -85,74 +102,33 @@ class LineNumbersTest < TestCase
     assert_equal('LineNumbers#method_1', call_tree.parent.target.full_name)
     assert_equal(10, call_tree.line)
 
-    assert_equal(2, method.call_trees.callees.count)
+    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(22, call_tree.line)
-
-    call_tree = method.call_trees.callees[1]
     assert_equal('LineNumbers#method_4', call_tree.target.full_name)
-    assert_equal(23, call_tree.line)
-
-    # Method 3
-    method = methods[3]
-    assert_equal('Kernel#sleep', method.full_name)
-    assert_equal(0, method.line)
-
-    assert_equal(2, 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)
 
-    call_tree = method.call_trees.callers[1]
-    assert_equal('LineNumbers#method_4', call_tree.parent.target.full_name)
-    assert_equal(27, call_tree.line)
-
-    assert_equal(0, method.call_trees.callees.count)
-
     # Method 4
     method = methods[4]
     assert_equal('LineNumbers#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('LineNumbers#method_3', call_tree.parent.target.full_name)
-    assert_equal(23, call_tree.line)
+    assert_equal(22, 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(27, call_tree.line)
+    assert_equal(0, method.call_trees.callees.count)
 
     # Method 5
     method = methods[5]
-    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 6
-    method = methods[6]
-    assert_equal('Integer#times', method.full_name)
-    assert_equal(0, method.line)
+    assert_equal('LineNumbersTest#test_function_line_no', method.full_name)
+    assert_equal(35, 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(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_3', call_tree.target.full_name)
-    assert_equal(17, call_tree.line)
+    assert_equal('LineNumbers#method_1', call_tree.target.full_name)
+    assert_equal(35, call_tree.line)
   end
 end

data/test/marshal_test.rb

@@ -5,6 +5,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)
@@ -108,8 +110,19 @@ class MarshalTest < TestCase
     assert_equal(measurement_1.called, measurement_2.called)
   end
 
-  def test_marshal
-    profile_1 = RubyProf.profile do
+  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
 
@@ -120,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.rb

@@ -18,13 +18,9 @@ class Allocator
     String.new(b_string)
   end
 
-  def internal_run
+  def run
     make_arrays
     make_hashes
     make_strings
   end
-
-  def run
-    internal_run
-  end
 end