ruby-prof 1.1.0-x64-mingw32 → 1.4.2-x64-mingw32

data/test/fiber_test.rb

@@ -8,66 +8,122 @@ require 'set'
 
 # --  Tests ----
 class FiberTest < TestCase
-  def fiber_test
-    @fiber_ids << Fiber.current.object_id
+
+  def enumerator_with_fibers
     enum = Enumerator.new do |yielder|
       [1,2].each do |x|
-        @fiber_ids << Fiber.current.object_id
-        sleep 0.1
         yielder.yield x
       end
     end
-    while true
-      begin
-        enum.next
-      rescue StopIteration
-        break
-      end
-    end
-    sleep 0.1
+
+    enum.next
+    enum.next
+  end
+
+  def fiber_yield_resume
+    fiber = Fiber.new do
+              Fiber.yield 1
+              Fiber.yield 2
+            end
+
+    fiber.resume
+    fiber.resume
   end
 
   def setup
     # Need to use wall time for this test due to the sleep calls
     RubyProf::measure_mode = RubyProf::WALL_TIME
-    @fiber_ids  = Set.new
-    @root_fiber = Fiber.current.object_id
-    @thread_id  = Thread.current.object_id
   end
 
   def test_fibers
-    result  = RubyProf.profile { fiber_test }
-    profiled_fiber_ids = result.threads.map(&:fiber_id)
-    assert_equal(2, result.threads.length)
-    assert_equal([@thread_id], result.threads.map(&:id).uniq)
-    assert_equal(@fiber_ids, Set.new(profiled_fiber_ids))
+    result  = RubyProf.profile { enumerator_with_fibers }
+
+    assert_equal(2, result.threads.size)
+
+    thread1 = result.threads[0]
+    methods = thread1.methods.sort.reverse
+    assert_equal(5, methods.count)
+
+    method = methods[0]
+    assert_equal('FiberTest#test_fibers', method.full_name)
+    assert_equal(1, method.called)
+
+    method = methods[1]
+    assert_equal('FiberTest#enumerator_with_fibers', method.full_name)
+    assert_equal(1, method.called)
 
-    assert profiled_fiber_ids.include?(@root_fiber)
-    assert(root_fiber_profile = result.threads.detect{|t| t.fiber_id == @root_fiber})
-    assert(enum_fiber_profile = result.threads.detect{|t| t.fiber_id != @root_fiber})
+    method = methods[2]
+    assert_equal('Enumerator#next', method.full_name)
+    assert_equal(2, method.called)
 
-    assert_in_delta(0.3, root_fiber_profile.total_time, 0.05)
-    assert_in_delta(0.2, enum_fiber_profile.total_time, 0.05)
+    method = methods[3]
+    assert_equal('Class#new', method.full_name)
+    assert_equal(1, method.called)
 
-    assert(method_next = root_fiber_profile.methods.detect{|m| m.full_name == "Enumerator#next"})
-    assert(method_each = enum_fiber_profile.methods.detect{|m| m.full_name == "Enumerator#each"})
+    method = methods[4]
+    assert_equal('Enumerator#initialize', method.full_name)
+    assert_equal(1, method.called)
 
-    assert_in_delta(0.2, method_next.total_time, 0.05)
-    assert_in_delta(0.2, method_each.total_time, 0.05)
+    thread2 = result.threads[1]
+    methods = thread2.methods.sort.reverse
+    assert_equal(4, methods.count)
+
+    method = methods[0]
+    assert_equal('Enumerator#each', method.full_name)
+    assert_equal(1, method.called)
+
+    method = methods[1]
+    assert_equal('Enumerator::Generator#each', method.full_name)
+    assert_equal(1, method.called)
+
+    method = methods[2]
+    assert_equal('Array#each', method.full_name)
+    assert_equal(1, method.called)
+
+    method = methods[3]
+    assert_equal('Enumerator::Yielder#yield', method.full_name)
+    assert_equal(2, method.called)
   end
 
-  def test_merged_fibers
-    result  = RubyProf.profile(merge_fibers: true) { fiber_test }
-    assert_equal(1, result.threads.length)
+  def test_fiber_resume
+    result  = RubyProf.profile { fiber_yield_resume }
+
+    assert_equal(2, result.threads.size)
+
+    thread1 = result.threads[0]
+    methods = thread1.methods.sort.reverse
+    assert_equal(5, methods.count)
+
+    method = methods[0]
+    assert_equal('FiberTest#test_fiber_resume', method.full_name)
+    assert_equal(1, method.called)
+
+    method = methods[1]
+    assert_equal('FiberTest#fiber_yield_resume', method.full_name)
+    assert_equal(1, method.called)
+
+    method = methods[2]
+    assert_equal('Fiber#resume', method.full_name)
+    assert_equal(2, method.called)
+
+    method = methods[3]
+    assert_equal('Class#new', method.full_name)
+    assert_equal(1, method.called)
+
+    method = methods[4]
+    assert_equal('Fiber#initialize', method.full_name)
+    assert_equal(1, method.called)
 
-    thread = result.threads.first
-    assert_equal(thread.id, thread.fiber_id)
-    assert_in_delta(0.3, thread.total_time, 0.05)
+    thread1 = result.threads[1]
+    methods = thread1.methods.sort.reverse
+    assert_equal(2, methods.count)
 
-    assert(method_next = thread.methods.detect{|m| m.full_name == "Enumerator#next"})
-    assert(method_each = thread.methods.detect{|m| m.full_name == "Enumerator#each"})
+    method = methods[0]
+    assert_equal('FiberTest#fiber_yield_resume', method.full_name)
+    assert_equal(1, method.called)
 
-    assert_in_delta(0.2, method_next.total_time, 0.05)
-    assert_in_delta(0.2, method_each.total_time, 0.05)
+    method = methods[1]
+    assert_equal('<Class::Fiber>#yield', method.full_name)
+    assert_equal(2, method.called)
   end
 end

data/test/gc_test.rb

@@ -2,8 +2,17 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
+Minitest::Test.i_suck_and_my_tests_are_order_dependent!
 
 class GcTest < TestCase
+  def setup
+    GC.stress = true
+  end
+
+  def teardown
+    GC.stress = false
+  end
+
   def some_method
     Array.new(3 * 4)
   end
@@ -15,82 +24,67 @@ class GcTest < TestCase
   end
 
   def test_hold_onto_thread
-    threads = 1000.times.reduce(Array.new) do |array, i|
+    threads = 5.times.reduce(Array.new) do |array, i|
       array.concat(run_profile.threads)
-      GC.start
       array
     end
 
     threads.each do |thread|
-      error = assert_raises(RuntimeError) do
-        thread.id
-      end
-      assert_match(/has already been freed/, error.message)
+      refute_nil(thread.id)
     end
-    assert(true)
   end
 
+
   def test_hold_onto_method
-    methods = 1000.times.reduce(Array.new) do |array, i|
-      array.concat(run_profile.threads.map(&:methods).flatten)
-      GC.start
+    methods = 5.times.reduce(Array.new) do |array, i|
+      profile = run_profile
+      array.concat(profile.threads.map(&:methods).flatten)
       array
     end
 
     methods.each do |method|
-      error = assert_raises(RuntimeError) do
-        method.method_name
-      end
-      assert_match(/has already been freed/, error.message)
+      refute_nil(method.method_name)
     end
-    assert(true)
   end
 
-  def test_hold_onto_parent_callers
-    call_infos = 1000.times.reduce(Array.new) do |array, i|
-      array.concat(run_profile.threads.map(&:methods).flatten.map(&:callers).flatten)
-      GC.start
+  def test_hold_onto_call_trees
+    method_call_infos = 5.times.reduce(Array.new) do |array, i|
+      profile = run_profile
+      call_trees = profile.threads.map(&:methods).flatten.map(&:call_trees).flatten
+      array.concat(call_trees)
       array
     end
 
-    call_infos.each do |call_info|
-      error = assert_raises(RuntimeError) do
-        call_info.source_file
-      end
-      assert_match(/has already been freed/, error.message)
+    method_call_infos.each do |call_trees|
+      refute_empty(call_trees.call_trees)
     end
-    assert(true)
   end
 
-  def test_hold_onto_parent_callees
-    call_infos = 1000.times.reduce(Array.new) do |array, i|
-      array.concat(run_profile.threads.map(&:methods).flatten.map(&:callees).flatten)
-      GC.start
+  def test_hold_onto_measurements
+    measurements = 5.times.reduce(Array.new) do |array, i|
+      profile = run_profile
+      measurements = profile.threads.map(&:methods).flatten.map(&:measurement)
+      array.concat(measurements)
       array
     end
 
-    call_infos.each do |call_info|
+    measurements.each do |measurement|
       error = assert_raises(RuntimeError) do
-        call_info.source_file
+        measurement.total_time
       end
-      assert_match(/has already been freed/, error.message)
+      assert_match(/RubyProf::Measurement instance has already been freed/, error.message)
     end
     assert(true)
   end
 
-  def test_hold_onto_measurements
-    measurements = 1000.times.reduce(Array.new) do |array, i|
-      array.concat(run_profile.threads.map(&:methods).flatten.map(&:callers).flatten.map(&:measurement))
-      GC.start
+  def test_hold_onto_root_call_tree
+    call_trees = 5.times.reduce(Array.new) do |array, i|
+      array.concat(run_profile.threads.map(&:call_tree))
       array
     end
 
-    measurements.each do |measurement|
-      error = assert_raises(RuntimeError) do
-        measurement.total_time
-      end
-      assert_match(/has already been freed/, error.message)
+    call_trees.each do |call_tree|
+      refute_nil(call_tree.source_file)
     end
-    assert(true)
   end
 end

data/test/inverse_call_tree_test.rb

@@ -0,0 +1,175 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+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
+  end
+
+  INVERSE_DEPTH.times do |i|
+    if i == 0
+      define_method("method_#{i}") do
+        sleep_amount = (i + 1) * 0.05
+        RubyProf.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)
+    profile = RubyProf.stop
+
+    assert_equal(1, profile.threads.count)
+
+    thread = profile.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(34, 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)
+
+    # InverseCallTreeTest#method_4
+    method = methods[1]
+    assert_equal('InverseCallTreeTest#method_4', method.full_name)
+    assert_equal(26, 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(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)
+
+    # 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(19, 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)
+
+    call_tree = method.call_trees.callers[2]
+    assert_equal('InverseCallTreeTest#method_2', call_tree.parent.target.full_name)
+    assert_equal(26, 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)
+
+    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(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(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(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)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(26, call_tree.line)
+
+    # InverseCallTreeTest#method_2
+    method = methods[4]
+    assert_equal('InverseCallTreeTest#method_2', method.full_name)
+    assert_equal(26, 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(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)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(26, 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)
+
+    # InverseCallTreeTest#method_1
+    method = methods[5]
+    assert_equal('InverseCallTreeTest#method_1', method.full_name)
+    assert_equal(26, 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(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)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(26, call_tree.line)
+
+    # InverseCallTreeTest#method_0
+    method = methods[6]
+    assert_equal('InverseCallTreeTest#method_0', method.full_name)
+    assert_equal(19, 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(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)
+  end
+end