ruby-prof 1.1.0-x64-mingw32 → 1.3.0-x64-mingw32

data/test/line_number_test.rb

@@ -6,25 +6,25 @@ require File.expand_path('../test_helper', __FILE__)
 class LineNumbers
   def method_1
     method_2
-    filler = 1
+    _filler = 1
     method_3
   end
 
   def method_2
-    filler = 1
+    _filler = 1
     2.times do |i|
-      filler = 2
+      _filler = 2
       method_3
     end
   end
 
   def method_3
-    sleep(0.4)
+    sleep(0.3)
     method_4
   end
 
   def method_4
-    sleep(1)
+    sleep(1.2)
   end
 end
 
@@ -45,117 +45,114 @@ class LineNumbersTest < TestCase
     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(0, method.call_trees.callers.count)
 
-    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)
+    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)
 
     # 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(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(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)
+    assert_equal(2, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('LineNumbers#method_2', call_tree.target.full_name)
+    assert_equal(8, call_tree.line)
 
-    call_info = method.callees[1]
-    assert_equal('LineNumbers#method_3', call_info.target.full_name)
-    assert_equal(10, call_info.line)
+    call_tree = method.call_trees.callees[1]
+    assert_equal('LineNumbers#method_3', call_tree.target.full_name)
+    assert_equal(10, call_tree.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)
+    assert_equal(2, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Integer#times', call_tree.parent.target.full_name)
+    assert_equal(17, call_tree.line)
 
-    call_info = method.callers[1]
-    assert_equal('LineNumbers#method_1', call_info.parent.full_name)
-    assert_equal(10, call_info.line)
+    call_tree = method.call_trees.callers[1]
+    assert_equal('LineNumbers#method_1', call_tree.parent.target.full_name)
+    assert_equal(10, call_tree.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)
+    assert_equal(2, 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_info = method.callees[1]
-    assert_equal('LineNumbers#method_4', call_info.target.full_name)
-    assert_equal(23, call_info.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.callers.count)
-    call_info = method.callers[0]
-    assert_equal('LineNumbers#method_3', call_info.parent.full_name)
-    assert_equal(22, call_info.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_info = method.callers[1]
-    assert_equal('LineNumbers#method_4', call_info.parent.full_name)
-    assert_equal(27, call_info.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.callees.count)
+    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(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.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(1, method.callees.count)
-    call_info = method.callees[0]
-    assert_equal('Kernel#sleep', call_info.target.full_name)
-    assert_equal(27, call_info.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)
 
     # 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.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.callees.count)
-    call_info = method.callees[0]
-    assert_equal('Integer#times', call_info.target.full_name)
-    assert_equal(15, call_info.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(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.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.callees.count)
-    call_info = method.callees[0]
-    assert_equal('LineNumbers#method_3', call_info.target.full_name)
-    assert_equal(17, call_info.line)
+    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)
   end
 end

data/test/marshal_test.rb

@@ -16,6 +16,7 @@ class MarshalTest < TestCase
       thread_2 = threads_2[i]
       assert_nil(thread_2.id)
       assert_equal(thread_1.fiber_id, thread_2.fiber_id)
+      verify_call_info(thread_1.call_tree, thread_2.call_tree)
 
       verify_methods(thread_1.methods, thread_2.methods)
     end
@@ -35,17 +36,12 @@ class MarshalTest < TestCase
       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_call_infos(method_1.call_trees, method_2.call_trees)
       verify_allocations(method_1.allocations, method_2.allocations)
     end
   end
@@ -69,17 +65,17 @@ class MarshalTest < TestCase
   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]
+    assert_equal(call_infos_1.call_trees.count, call_infos_2.call_trees.count)
+    call_infos_1.call_trees.count.times do |i|
+      call_info_1 = call_infos_1.call_trees[i]
+      call_info_2 = call_infos_2.call_trees[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.parent&.target, call_info_2.parent&.target)
 
     assert_equal(call_info_1.depth, call_info_2.depth)
     assert_equal(call_info_1.source_file, call_info_2.source_file)

data/test/measure_allocations_test.rb

@@ -23,10 +23,6 @@ class MeasureAllocationsTest < TestCase
     thread = result.threads.first
     assert_in_delta(20, thread.total_time, 1)
 
-    root_methods = thread.root_methods
-    assert_equal(1, root_methods.count)
-    assert_equal("MeasureAllocationsTest#test_allocations", root_methods[0].full_name)
-
     methods = result.threads.first.methods.sort.reverse
     assert_equal(13, methods.length)
 
@@ -38,28 +34,22 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_in_delta(20, method.children_time, 1)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_nil(call_info.parent)
-    assert_equal(20, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(20, call_info.children_time)
-
-    assert_equal(2, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Class#new', call_info.target.full_name)
-    assert_equal(1, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(0, call_info.children_time)
-
-    call_info = method.callees[1]
-    assert_equal('Allocator#run', call_info.target.full_name)
-    assert_equal(19, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(19, call_info.children_time)
+    assert_equal(0, method.call_trees.callers.length)
+
+    assert_equal(2, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Class#new', call_tree.target.full_name)
+    assert_equal(1, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(1, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Allocator#run', call_tree.target.full_name)
+    assert_equal(19, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(19, call_tree.children_time)
 
     # Method 1
     method = methods[1]
@@ -69,21 +59,21 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_equal(19, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('MeasureAllocationsTest#test_allocations', call_info.parent.full_name)
-    assert_equal(19, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(19, call_info.children_time)
-
-    assert_equal(1, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Allocator#internal_run', call_info.target.full_name)
-    assert_equal(19, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(19, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    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)
+    assert_equal(19, call_tree.children_time)
+
+    assert_equal(1, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Allocator#internal_run', call_tree.target.full_name)
+    assert_equal(19, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(19, call_tree.children_time)
 
     # Method 2
     method = methods[2]
@@ -93,35 +83,35 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_equal(19, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Allocator#run', call_info.parent.full_name)
-    assert_equal(19, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(19, call_info.children_time)
-
-    assert_equal(3, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Allocator#make_arrays', call_info.target.full_name)
-    assert_equal(10, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(10, call_info.children_time)
-
-    call_info = method.callees[1]
-    assert_equal('Allocator#make_hashes', call_info.target.full_name)
-    assert_equal(5, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(5, call_info.children_time)
-
-    call_info = method.callees[2]
-    assert_equal('Allocator#make_strings', call_info.target.full_name)
-    assert_equal(4, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(3, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Allocator#run', 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)
+    assert_equal(19, call_tree.children_time)
+
+    assert_equal(3, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Allocator#make_arrays', call_tree.target.full_name)
+    assert_equal(10, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(10, call_tree.children_time)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Allocator#make_hashes', call_tree.target.full_name)
+    assert_equal(5, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(5, call_tree.children_time)
+
+    call_tree = method.call_trees.callees[2]
+    assert_equal('Allocator#make_strings', call_tree.target.full_name)
+    assert_equal(4, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(1, call_tree.self_time)
+    assert_equal(3, call_tree.children_time)
 
     # Method 3
     method = methods[3]
@@ -131,63 +121,63 @@ class MeasureAllocationsTest < TestCase
     assert_equal(17, method.self_time)
     assert_equal(1, method.children_time)
 
-    assert_equal(4, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('MeasureAllocationsTest#test_allocations', call_info.parent.full_name)
-    assert_equal(1, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(0, call_info.children_time)
-
-    call_info = method.callers[1]
-    assert_equal('Integer#times', call_info.parent.full_name)
-    assert_equal(10, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(10, call_info.self_time)
-    assert_equal(0, call_info.children_time)
-
-    call_info = method.callers[2]
-    assert_equal('Allocator#make_hashes', call_info.parent.full_name)
-    assert_equal(5, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(5, call_info.self_time)
-    assert_equal(0, call_info.children_time)
-
-    call_info = method.callers[3]
-    assert_equal('Allocator#make_strings', call_info.parent.full_name)
-    assert_equal(2, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(1, call_info.children_time)
-
-    assert_equal(4, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('BasicObject#initialize', call_info.target.full_name)
-    assert_equal(0, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(0, call_info.children_time)
-
-    call_info = method.callees[1]
-    assert_equal('Array#initialize', call_info.target.full_name)
-    assert_equal(0, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(0, call_info.children_time)
-
-    call_info = method.callees[2]
-    assert_equal('Hash#initialize', call_info.target.full_name)
-    assert_equal(0, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(0, call_info.children_time)
-
-    call_info = method.callees[3]
-    assert_equal('String#initialize', call_info.target.full_name)
-    assert_equal(1, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(0, call_info.children_time)
+    assert_equal(4, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    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)
+    assert_equal(0, call_tree.children_time)
+
+    call_tree = method.call_trees.callers[1]
+    assert_equal('Integer#times', call_tree.parent.target.full_name)
+    assert_equal(10, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(10, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
+
+    call_tree = method.call_trees.callers[2]
+    assert_equal('Allocator#make_hashes', call_tree.parent.target.full_name)
+    assert_equal(5, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(5, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
+
+    call_tree = method.call_trees.callers[3]
+    assert_equal('Allocator#make_strings', call_tree.parent.target.full_name)
+    assert_equal(2, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(1, call_tree.self_time)
+    assert_equal(1, call_tree.children_time)
+
+    assert_equal(4, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('BasicObject#initialize', call_tree.target.full_name)
+    assert_equal(0, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Array#initialize', call_tree.target.full_name)
+    assert_equal(0, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
+
+    call_tree = method.call_trees.callees[2]
+    assert_equal('Hash#initialize', call_tree.target.full_name)
+    assert_equal(0, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
+
+    call_tree = method.call_trees.callees[3]
+    assert_equal('String#initialize', call_tree.target.full_name)
+    assert_equal(1, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(1, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
 
     # Method 4
     method = methods[4]
@@ -197,21 +187,21 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_equal(10, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Allocator#internal_run', call_info.parent.full_name)
-    assert_equal(10, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(10, call_info.children_time)
-
-    assert_equal(1, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Integer#times', call_info.target.full_name)
-    assert_equal(10, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(10, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+    assert_equal(10, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(10, call_tree.children_time)
+
+    assert_equal(1, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Integer#times', call_tree.target.full_name)
+    assert_equal(10, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(10, call_tree.children_time)
 
     # Method 5
     method = methods[5]
@@ -221,21 +211,21 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_equal(10, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Allocator#make_arrays', call_info.parent.full_name)
-    assert_equal(10, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(10, call_info.children_time)
-
-    assert_equal(1, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Class#new', call_info.target.full_name)
-    assert_equal(10, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(10, call_info.self_time)
-    assert_equal(0, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Allocator#make_arrays', call_tree.parent.target.full_name)
+    assert_equal(10, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(10, call_tree.children_time)
+
+    assert_equal(1, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Class#new', call_tree.target.full_name)
+    assert_equal(10, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(10, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
 
     # Method 6
     method = methods[6]
@@ -245,21 +235,21 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_equal(5, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Allocator#internal_run', call_info.parent.full_name)
-    assert_equal(5, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(5, call_info.children_time)
-
-    assert_equal(1, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Class#new', call_info.target.full_name)
-    assert_equal(5, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(5, call_info.self_time)
-    assert_equal(0, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+    assert_equal(5, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(5, call_tree.children_time)
+
+    assert_equal(1, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Class#new', call_tree.target.full_name)
+    assert_equal(5, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(5, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
 
     # Method 7
     method = methods[7]
@@ -269,28 +259,28 @@ class MeasureAllocationsTest < TestCase
     assert_equal(1, method.self_time)
     assert_equal(3, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Allocator#internal_run', call_info.parent.full_name)
-    assert_equal(4, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(3, call_info.children_time)
-
-    assert_equal(2, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('String#*', call_info.target.full_name)
-    assert_equal(1, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(0, call_info.children_time)
-
-    call_info = method.callees[1]
-    assert_equal('Class#new', call_info.target.full_name)
-    assert_equal(2, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(1, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+    assert_equal(4, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(1, call_tree.self_time)
+    assert_equal(3, call_tree.children_time)
+
+    assert_equal(2, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('String#*', call_tree.target.full_name)
+    assert_equal(1, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(1, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('Class#new', call_tree.target.full_name)
+    assert_equal(2, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(1, call_tree.self_time)
+    assert_equal(1, call_tree.children_time)
 
     # Method 8
     method = methods[8]
@@ -300,15 +290,15 @@ class MeasureAllocationsTest < TestCase
     assert_equal(1, method.self_time)
     assert_equal(0, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Allocator#make_strings', call_info.parent.full_name)
-    assert_equal(1, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(0, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Allocator#make_strings', 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)
+    assert_equal(0, call_tree.children_time)
 
-    assert_equal(0, method.callees.length)
+    assert_equal(0, method.call_trees.callees.length)
 
     # Method 9
     method = methods[9]
@@ -318,15 +308,15 @@ class MeasureAllocationsTest < TestCase
     assert_equal(1, method.self_time)
     assert_equal(0, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Class#new', call_info.parent.full_name)
-    assert_equal(1, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(1, call_info.self_time)
-    assert_equal(0, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Class#new', 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)
+    assert_equal(0, call_tree.children_time)
 
-    assert_equal(0, method.callees.length)
+    assert_equal(0, method.call_trees.callees.length)
 
     # Method 10
     method = methods[10]
@@ -336,15 +326,15 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_equal(0, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Class#new', call_info.parent.full_name)
-    assert_equal(0, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(0, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Class#new', call_tree.parent.target.full_name)
+    assert_equal(0, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
 
-    assert_equal(0, method.callees.length)
+    assert_equal(0, method.call_trees.callees.length)
 
     # Method 11
     method = methods[11]
@@ -354,15 +344,15 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_equal(0, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Class#new', call_info.parent.full_name)
-    assert_equal(0, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(0, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Class#new', call_tree.parent.target.full_name)
+    assert_equal(0, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
 
-    assert_equal(0, method.callees.length)
+    assert_equal(0, method.call_trees.callees.length)
 
     # Method 12
     method = methods[12]
@@ -372,14 +362,14 @@ class MeasureAllocationsTest < TestCase
     assert_equal(0, method.self_time)
     assert_equal(0, method.children_time)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Class#new', call_info.parent.full_name)
-    assert_equal(0, call_info.total_time)
-    assert_equal(0, call_info.wait_time)
-    assert_equal(0, call_info.self_time)
-    assert_equal(0, call_info.children_time)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Class#new', call_tree.parent.target.full_name)
+    assert_equal(0, call_tree.total_time)
+    assert_equal(0, call_tree.wait_time)
+    assert_equal(0, call_tree.self_time)
+    assert_equal(0, call_tree.children_time)
 
-    assert_equal(0, method.callees.length)
+    assert_equal(0, method.call_trees.callees.length)
   end
 end