ruby-prof 0.16.2 → 1.1.0

data/test/exclude_threads_test.rb

@@ -1,53 +1,53 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-
-# --  Tests ----
-class ExcludeThreadsTest < TestCase
-  def test_exclude_threads
-
-    def thread1_proc
-      sleep(0.5)
-      sleep(2)
-    end
-
-    def thread2_proc
-      sleep(0.5)
-      sleep(2)
-    end
-
-    thread1 = Thread.new do
-      thread1_proc
-    end
-
-    thread2 = Thread.new do
-      thread2_proc
-    end
-
-    # exclude_threads already includes the minitest thread pool
-    RubyProf.exclude_threads += [ thread2 ]
-
-    RubyProf.start
-
-    thread1.join
-    thread2.join
-
-    result = RubyProf.stop
-
-    assert_equal(2, result.threads.length)
-
-    output = Array.new
-    result.threads.each do |thread|
-      thread.methods.each do | m |
-        if m.full_name.index("ExcludeThreadsTest#thread") == 0
-          output.push(m.full_name)
-        end
-      end
-    end
-
-    assert_equal(1, output.length)
-    assert_equal("ExcludeThreadsTest#thread1_proc", output[0])
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+
+# --  Tests ----
+class ExcludeThreadsTest < TestCase
+  def test_exclude_threads
+
+    def thread1_proc
+      sleep(0.5)
+      sleep(2)
+    end
+
+    def thread2_proc
+      sleep(0.5)
+      sleep(2)
+    end
+
+    thread1 = Thread.new do
+      thread1_proc
+    end
+
+    thread2 = Thread.new do
+      thread2_proc
+    end
+
+    # exclude_threads already includes the minitest thread pool
+    RubyProf.exclude_threads += [ thread2 ]
+
+    RubyProf.start
+
+    thread1.join
+    thread2.join
+
+    result = RubyProf.stop
+
+    assert_equal(2, result.threads.length)
+
+    output = Array.new
+    result.threads.each do |thread|
+      thread.methods.each do | m |
+        if m.full_name.index("ExcludeThreadsTest#thread") == 0
+          output.push(m.full_name)
+        end
+      end
+    end
+
+    assert_equal(1, output.length)
+    assert_equal("ExcludeThreadsTest#thread1_proc", output[0])
+  end
+end

data/test/fiber_test.rb

@@ -1,79 +1,73 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-require 'timeout'
-require 'set'
-begin
-  require 'fiber'
-rescue LoadError
-end
-
-# --  Tests ----
-class FiberTest < TestCase
-
-  def fiber_test
-    @fiber_ids << Fiber.current.object_id
-    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
-  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))
-
-    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})
-
-    assert_in_delta(0.3, root_fiber_profile.total_time, 0.05)
-    assert_in_delta(0.2, enum_fiber_profile.total_time, 0.05)
-
-    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"})
-
-    assert_in_delta(0.2, method_next.total_time, 0.05)
-    assert_in_delta(0.2, method_each.total_time, 0.05)
-  end
-
-  def test_merged_fibers
-    result  = RubyProf.profile(merge_fibers: true) { fiber_test }
-    assert_equal(1, result.threads.length)
-
-    profile = result.threads.first
-    assert_equal 0, profile.fiber_id
-
-    assert_in_delta(0.3, profile.total_time, 0.05)
-
-    assert(method_next = profile.methods.detect{|m| m.full_name == "Enumerator#next"})
-    assert(method_each = profile.methods.detect{|m| m.full_name == "Enumerator#each"})
-
-    assert_in_delta(0.2, method_next.total_time, 0.05)
-    assert_in_delta(0.2, method_each.total_time, 0.05)
-  end
-
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+require 'fiber'
+require 'timeout'
+require 'set'
+
+# --  Tests ----
+class FiberTest < TestCase
+  def fiber_test
+    @fiber_ids << Fiber.current.object_id
+    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
+  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))
+
+    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})
+
+    assert_in_delta(0.3, root_fiber_profile.total_time, 0.05)
+    assert_in_delta(0.2, enum_fiber_profile.total_time, 0.05)
+
+    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"})
+
+    assert_in_delta(0.2, method_next.total_time, 0.05)
+    assert_in_delta(0.2, method_each.total_time, 0.05)
+  end
+
+  def test_merged_fibers
+    result  = RubyProf.profile(merge_fibers: true) { fiber_test }
+    assert_equal(1, result.threads.length)
+
+    thread = result.threads.first
+    assert_equal(thread.id, thread.fiber_id)
+    assert_in_delta(0.3, thread.total_time, 0.05)
+
+    assert(method_next = thread.methods.detect{|m| m.full_name == "Enumerator#next"})
+    assert(method_each = thread.methods.detect{|m| m.full_name == "Enumerator#each"})
+
+    assert_in_delta(0.2, method_next.total_time, 0.05)
+    assert_in_delta(0.2, method_each.total_time, 0.05)
+  end
+end

data/test/gc_test.rb

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class GcTest < TestCase
+  def some_method
+    Array.new(3 * 4)
+  end
+
+  def run_profile
+    RubyProf.profile do
+      self.some_method
+    end
+  end
+
+  def test_hold_onto_thread
+    threads = 1000.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)
+    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
+      array
+    end
+
+    methods.each do |method|
+      error = assert_raises(RuntimeError) do
+        method.method_name
+      end
+      assert_match(/has already been freed/, error.message)
+    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
+      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)
+    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
+      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)
+    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
+      array
+    end
+
+    measurements.each do |measurement|
+      error = assert_raises(RuntimeError) do
+        measurement.total_time
+      end
+      assert_match(/has already been freed/, error.message)
+    end
+    assert(true)
+  end
+end

data/test/line_number_test.rb

@@ -1,71 +1,161 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class LineNumbers
-  def method1
-  end
-
-  def method2
-    method1
-  end
-
-  def method3
-    sleep(1)
-  end
-end
-
-# --  Tests ----
-class LineNumbersTest < TestCase
-  def test_function_line_no
-    numbers = LineNumbers.new
-
-    result = RubyProf.profile do
-      numbers.method2
-    end
-
-    methods = result.threads.first.methods.sort.reverse
-    assert_equal(3, methods.length)
-
-    method = methods[0]
-    assert_equal('LineNumbersTest#test_function_line_no', method.full_name)
-    assert_equal(25, method.line)
-
-    method = methods[1]
-    assert_equal('LineNumbers#method2', method.full_name)
-    assert_equal(10, method.line)
-
-    method = methods[2]
-    assert_equal('LineNumbers#method1', method.full_name)
-    assert_equal(7, method.line)
-  end
-
-  def test_c_function
-    numbers = LineNumbers.new
-
-    result = RubyProf.profile do
-      numbers.method3
-    end
-
-    methods = result.threads.first.methods.sort_by {|method| method.full_name}
-    assert_equal(3, methods.length)
-
-    # Methods:
-    #   LineNumbers#method3
-    #   LineNumbersTest#test_c_function
-    #   Kernel#sleep
-
-    method = methods[0]
-    assert_equal('Kernel#sleep', method.full_name)
-    assert_equal(0, method.line)
-
-    method = methods[1]
-    assert_equal('LineNumbers#method3', method.full_name)
-    assert_equal(14, method.line)
-
-    method = methods[2]
-    assert_equal('LineNumbersTest#test_c_function', method.full_name)
-    assert_equal(48, method.line)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class LineNumbers
+  def method_1
+    method_2
+    filler = 1
+    method_3
+  end
+
+  def method_2
+    filler = 1
+    2.times do |i|
+      filler = 2
+      method_3
+    end
+  end
+
+  def method_3
+    sleep(0.4)
+    method_4
+  end
+
+  def method_4
+    sleep(1)
+  end
+end
+
+# --  Tests ----
+class LineNumbersTest < TestCase
+  def test_function_line_no
+    numbers = LineNumbers.new
+
+    result = RubyProf.profile do
+      numbers.method_1
+    end
+
+    methods = result.threads.first.methods.sort.reverse
+    assert_equal(7, methods.length)
+
+    # Method 0
+    method = methods[0]
+    assert_equal('LineNumbersTest#test_function_line_no', method.full_name)
+    assert_equal(37, method.line)
+
+    assert_equal(1, method.callers.count)
+    call_info = method.callers[0]
+    assert_nil(call_info.parent)
+    assert_equal(37, call_info.line)
+
+    assert_equal(1, method.callees.count)
+    call_info = method.callees[0]
+    assert_equal('LineNumbers#method_1', call_info.target.full_name)
+    assert_equal(37, call_info.line)
+
+    # Method 1
+    method = methods[1]
+    assert_equal('LineNumbers#method_1', method.full_name)
+    assert_equal(7, method.line)
+
+    assert_equal(1, method.callers.count)
+    call_info = method.callers[0]
+    assert_equal('LineNumbersTest#test_function_line_no', call_info.parent.full_name)
+    assert_equal(37, call_info.line)
+
+    assert_equal(2, method.callees.count)
+    call_info = method.callees[0]
+    assert_equal('LineNumbers#method_2', call_info.target.full_name)
+    assert_equal(8, call_info.line)
+
+    call_info = method.callees[1]
+    assert_equal('LineNumbers#method_3', call_info.target.full_name)
+    assert_equal(10, call_info.line)
+
+    # Method 2
+    method = methods[2]
+    assert_equal('LineNumbers#method_3', method.full_name)
+    assert_equal(21, method.line)
+
+    assert_equal(2, method.callers.count)
+    call_info = method.callers[0]
+    assert_equal('Integer#times', call_info.parent.full_name)
+    assert_equal(17, call_info.line)
+
+    call_info = method.callers[1]
+    assert_equal('LineNumbers#method_1', call_info.parent.full_name)
+    assert_equal(10, call_info.line)
+
+    assert_equal(2, method.callees.count)
+    call_info = method.callees[0]
+    assert_equal('Kernel#sleep', call_info.target.full_name)
+    assert_equal(22, call_info.line)
+
+    call_info = method.callees[1]
+    assert_equal('LineNumbers#method_4', call_info.target.full_name)
+    assert_equal(23, call_info.line)
+
+    # Method 3
+    method = methods[3]
+    assert_equal('Kernel#sleep', method.full_name)
+    assert_equal(0, method.line)
+
+    assert_equal(2, method.callers.count)
+    call_info = method.callers[0]
+    assert_equal('LineNumbers#method_3', call_info.parent.full_name)
+    assert_equal(22, call_info.line)
+
+    call_info = method.callers[1]
+    assert_equal('LineNumbers#method_4', call_info.parent.full_name)
+    assert_equal(27, call_info.line)
+
+    assert_equal(0, method.callees.count)
+
+    # Method 4
+    method = methods[4]
+    assert_equal('LineNumbers#method_4', method.full_name)
+    assert_equal(26, method.line)
+
+    assert_equal(1, method.callers.count)
+    call_info = method.callers[0]
+    assert_equal('LineNumbers#method_3', call_info.parent.full_name)
+    assert_equal(23, call_info.line)
+
+    assert_equal(1, method.callees.count)
+    call_info = method.callees[0]
+    assert_equal('Kernel#sleep', call_info.target.full_name)
+    assert_equal(27, call_info.line)
+
+    # Method 5
+    method = methods[5]
+    assert_equal('LineNumbers#method_2', method.full_name)
+    assert_equal(13, method.line)
+
+    assert_equal(1, method.callers.count)
+    call_info = method.callers[0]
+    assert_equal('LineNumbers#method_1', call_info.parent.full_name)
+    assert_equal(8, call_info.line)
+
+    assert_equal(1, method.callees.count)
+    call_info = method.callees[0]
+    assert_equal('Integer#times', call_info.target.full_name)
+    assert_equal(15, call_info.line)
+
+    # Method 6
+    method = methods[6]
+    assert_equal('Integer#times', method.full_name)
+    assert_equal(0, method.line)
+
+    assert_equal(1, method.callers.count)
+    call_info = method.callers[0]
+    assert_equal('LineNumbers#method_2', call_info.parent.full_name)
+    assert_equal(15, call_info.line)
+
+    assert_equal(1, method.callees.count)
+    call_info = method.callees[0]
+    assert_equal('LineNumbers#method_3', call_info.target.full_name)
+    assert_equal(17, call_info.line)
+  end
+end