ruby-prof 0.18.0-x64-mingw32 → 1.1.0-x64-mingw32

data/test/call_info_visitor_test.rb

@@ -11,10 +11,10 @@ class CallInfoVisitorTest < TestCase
 
   def test_visit
     result = RubyProf.profile do
-      RubyProf::C1.hello
+      RubyProf::C1.sleep_wait
     end
 
-    visitor = RubyProf::CallInfoVisitor.new(result.threads.first.top_call_infos)
+    visitor = RubyProf::CallInfoVisitor.new(result.threads.first.root_methods)
 
     method_names = Array.new
 
@@ -24,7 +24,7 @@ class CallInfoVisitorTest < TestCase
 
     assert_equal(3, method_names.length)
     assert_equal("CallInfoVisitorTest#test_visit", method_names[0])
-    assert_equal("<Class::RubyProf::C1>#hello", method_names[1])
+    assert_equal("<Class::RubyProf::C1>#sleep_wait", method_names[1])
     assert_equal("Kernel#sleep", method_names[2])
   end
 end

data/test/dynamic_method_test.rb

@@ -38,8 +38,6 @@ class DynamicMethodTest < TestCase
       medley.peach
     end
 
-    # RubyProf::FlatPrinter.new(result).print(STDOUT)
-
     methods = result.threads.first.methods.sort.reverse
     expected_method_names = %w(
       DynamicMethodTest#test_dynamic_method

data/test/fiber_test.rb

@@ -2,25 +2,21 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
+require 'fiber'
 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
+      [1,2].each do |x|
+        @fiber_ids << Fiber.current.object_id
+        sleep 0.1
+        yielder.yield x
       end
+    end
     while true
       begin
         enum.next
@@ -64,16 +60,14 @@ class FiberTest < TestCase
     result  = RubyProf.profile(merge_fibers: true) { fiber_test }
     assert_equal(1, result.threads.length)
 
-    profile = result.threads.first
-    assert_equal 0, profile.fiber_id
+    thread = result.threads.first
+    assert_equal(thread.id, thread.fiber_id)
+    assert_in_delta(0.3, thread.total_time, 0.05)
 
-    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(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

@@ -4,14 +4,26 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class LineNumbers
-  def method1
+  def method_1
+    method_2
+    filler = 1
+    method_3
   end
 
-  def method2
-    method1
+  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 method3
+  def method_4
     sleep(1)
   end
 end
@@ -22,59 +34,128 @@ class LineNumbersTest < TestCase
     numbers = LineNumbers.new
 
     result = RubyProf.profile do
-      numbers.method2
+      numbers.method_1
     end
 
     methods = result.threads.first.methods.sort.reverse
-    assert_equal(3, methods.length)
+    assert_equal(7, methods.length)
 
+    # Method 0
     method = methods[0]
     assert_equal('LineNumbersTest#test_function_line_no', method.full_name)
-    assert_equal(25, method.line)
+    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#method2', method.full_name)
-    if RUBY_VERSION < "2.5"
-      assert_equal(10, method.line)
-    else
-      assert_equal(11, method.line)
-    end
+    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#method1', method.full_name)
-    assert_equal(7, method.line)
-  end
+    assert_equal('LineNumbers#method_3', method.full_name)
+    assert_equal(21, method.line)
 
-  def test_c_function
-    numbers = LineNumbers.new
+    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)
 
-    result = RubyProf.profile do
-      numbers.method3
-    end
+    call_info = method.callers[1]
+    assert_equal('LineNumbers#method_1', call_info.parent.full_name)
+    assert_equal(10, call_info.line)
 
-    methods = result.threads.first.methods.sort_by {|method| method.full_name}
-    assert_equal(3, methods.length)
+    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)
 
-    # Methods:
-    #   LineNumbers#method3
-    #   LineNumbersTest#test_c_function
-    #   Kernel#sleep
+    call_info = method.callees[1]
+    assert_equal('LineNumbers#method_4', call_info.target.full_name)
+    assert_equal(23, call_info.line)
 
-    method = methods[0]
+    # Method 3
+    method = methods[3]
     assert_equal('Kernel#sleep', method.full_name)
     assert_equal(0, method.line)
 
-    method = methods[1]
-    assert_equal('LineNumbers#method3', method.full_name)
-    if RUBY_VERSION < "2.5"
-      assert_equal(14, method.line)
-    else
-      assert_equal(15, method.line)
-    end
+    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)
 
-    method = methods[2]
-    assert_equal('LineNumbersTest#test_c_function', method.full_name)
-    assert_equal(52, method.line)
-  end
+    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

data/test/marshal_test.rb

@@ -0,0 +1,119 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path("../test_helper", __FILE__)
+require 'stringio'
+
+class MarshalTest < TestCase
+  def verify_profile(profile_1, profile_2)
+    verify_threads(profile_1.threads, profile_2.threads)
+  end
+
+  def verify_threads(threads_1, threads_2)
+    assert_equal(threads_1.count, threads_2.count)
+    threads_1.count.times do |i|
+      thread_1 = threads_1[i]
+      thread_2 = threads_2[i]
+      assert_nil(thread_2.id)
+      assert_equal(thread_1.fiber_id, thread_2.fiber_id)
+
+      verify_methods(thread_1.methods, thread_2.methods)
+    end
+  end
+
+  def verify_methods(methods_1, methods_2)
+    assert_equal(methods_1.count, methods_2.count)
+
+    methods_1.count.times do |i|
+      method_1 = methods_1[i]
+      method_2 = methods_2[i]
+
+      assert_equal(method_1.klass_name, method_2.klass_name)
+      assert_equal(method_1.klass_flags, method_2.klass_flags)
+
+      assert_equal(method_1.method_name, method_2.method_name)
+      assert_equal(method_1.full_name, method_2.full_name)
+
+      assert_equal(method_1.recursive?, method_2.recursive?)
+      assert_equal(method_1.root?, method_2.root?)
+      assert_equal(method_1.excluded?, method_2.excluded?)
+
+      assert_equal(method_1.source_file, method_2.source_file)
+      assert_equal(method_1.line, method_2.line)
+
+      verify_measurement(method_1.measurement, method_2.measurement)
+
+      verify_call_infos(method_1.callers, method_2.callers)
+      verify_call_infos(method_1.callees, method_2.callees)
+
+      verify_allocations(method_1.allocations, method_2.allocations)
+    end
+  end
+
+  def verify_allocations(allocations_1, allocations_2)
+    assert_equal(allocations_1.count, allocations_2.count)
+
+    allocations_1.count.times do |i|
+      allocation_1 = allocations_1[i]
+      allocation_2 = allocations_2[i]
+
+      assert_equal(allocation_1.klass_name, allocation_2.klass_name)
+      assert_equal(allocation_1.klass_flags, allocation_2.klass_flags)
+
+      assert_equal(allocation_1.count, allocation_2.count)
+      assert_equal(allocation_1.memory, allocation_2.memory)
+
+      assert_equal(allocation_1.source_file, allocation_2.source_file)
+      assert_equal(allocation_1.line, allocation_2.line)
+    end
+  end
+
+  def verify_call_infos(call_infos_1, call_infos_2)
+    assert_equal(call_infos_1.count, call_infos_2.count)
+    call_infos_1.count.times do |i|
+      call_info_1 = call_infos_1[i]
+      call_info_2 = call_infos_2[i]
+      verify_call_info(call_info_1, call_info_2)
+    end
+  end
+
+  def verify_call_info(call_info_1, call_info_2)
+    assert_equal(call_info_1.parent, call_info_2.parent)
+    assert_equal(call_info_1.target, call_info_2.target)
+
+    assert_equal(call_info_1.depth, call_info_2.depth)
+    assert_equal(call_info_1.source_file, call_info_2.source_file)
+    assert_equal(call_info_1.line, call_info_2.line)
+
+    verify_measurement(call_info_1.measurement, call_info_2.measurement)
+  end
+
+  def verify_measurement(measurement_1, measurement_2)
+    assert_equal(measurement_1.total_time, measurement_2.total_time)
+    assert_equal(measurement_1.self_time, measurement_2.self_time)
+    assert_equal(measurement_1.wait_time, measurement_2.wait_time)
+    assert_equal(measurement_1.called, measurement_2.called)
+  end
+
+  def test_marshal
+    profile_1 = RubyProf.profile 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_singleton
+    profile_1 = RubyProf.profile do
+      SingletonTest.instance.busy_wait
+    end
+
+    data = Marshal.dump(profile_1)
+    profile_2 = Marshal.load(data)
+
+    verify_profile(profile_1, profile_2)
+  end
+end