ruby-prof 2.0.0 → 2.0.1

data/test/call_tree_builder.rb

@@ -1,126 +1,126 @@
-# frozen_string_literal: true
-
-require File.expand_path('../test_helper', __FILE__)
-require 'base64'
-
-# Create a DummyClass with methods so we can create call trees in the test_merge method below
-class DummyClass
-  %i[root a b aa ab ba bb].each do |method_name|
-    define_method(method_name) do
-    end
-  end
-end
-
-def create_call_tree(method_name)
-  method_info = RubyProf::MethodInfo.new(DummyClass, method_name)
-  RubyProf::CallTree.new(method_info)
-end
-
-def build_call_tree(tree_hash)
-  # tree_hash is a hash keyed on the parent method_name whose values are
-  # child methods. Example:
-  #
-  # tree_hash = {root: [:a, :b],
-  #              a: [:aa, :ab],
-  #              b: [:bb]}
-  #
-  # Note this is a simplified structure for testing. It assumes methods
-  # are only called from one call_tree.
-
-  call_trees = Hash.new
-  tree_hash.each do |method_name, children|
-    parent = call_trees[method_name] ||= create_call_tree(method_name)
-    children.each do |child_method_name|
-      child = call_trees[child_method_name] ||= create_call_tree(child_method_name)
-      parent.add_child(child)
-    end
-  end
-
-  call_trees
-end
-
-def create_call_tree_1
-  #
-  #          root    
-  #        /     \   
-  #       a       b  
-  #     /  \       \ 
-  #   aa   ab      bb
-  #
-
-  # ------ Call Trees 1 -------------
-  tree_hash = {root: [:a, :b],
-               a: [:aa, :ab],
-               b: [:bb]}
-
-  call_trees = build_call_tree(tree_hash)
-
-  # Setup times
-  call_trees[:aa].measurement.total_time = 1.5
-  call_trees[:aa].measurement.self_time = 1.5
-  call_trees[:ab].measurement.total_time = 2.2
-  call_trees[:ab].measurement.self_time = 2.2
-  call_trees[:a].measurement.total_time = 3.7
-
-  call_trees[:aa].target.measurement.total_time = 1.5
-  call_trees[:aa].target.measurement.self_time = 1.5
-  call_trees[:ab].target.measurement.total_time = 2.2
-  call_trees[:ab].target.measurement.self_time = 2.2
-  call_trees[:a].target.measurement.total_time = 3.7
-
-  call_trees[:bb].measurement.total_time = 4.3
-  call_trees[:bb].measurement.self_time = 4.3
-  call_trees[:b].measurement.total_time = 4.3
-
-  call_trees[:bb].target.measurement.total_time = 4.3
-  call_trees[:bb].target.measurement.self_time = 4.3
-  call_trees[:b].target.measurement.total_time = 4.3
-
-  call_trees[:root].measurement.total_time = 8.0
-  call_trees[:root].target.measurement.total_time = 8.0
-
-  call_trees[:root]
-end
-
-def create_call_tree_2
-  #
-  #      root
-  #    /     \
-  #   a       b
-  #    \     / \
-  #    ab  ba  bb
-
-  tree_hash = {root: [:a, :b],
-               a: [:ab],
-               b: [:ba, :bb]}
-
-  call_trees = build_call_tree(tree_hash)
-
-  # Setup times
-  call_trees[:ab].measurement.total_time = 0.4
-  call_trees[:ab].measurement.self_time = 0.4
-  call_trees[:a].measurement.total_time = 0.4
-
-  call_trees[:ab].target.measurement.total_time = 0.4
-  call_trees[:ab].target.measurement.self_time = 0.4
-  call_trees[:a].target.measurement.total_time = 0.4
-
-  call_trees[:ba].measurement.total_time = 0.9
-  call_trees[:ba].measurement.self_time = 0.7
-  call_trees[:ba].measurement.wait_time = 0.2
-  call_trees[:bb].measurement.total_time = 2.3
-  call_trees[:bb].measurement.self_time = 2.3
-  call_trees[:b].measurement.total_time = 3.2
-
-  call_trees[:ba].target.measurement.total_time = 0.9
-  call_trees[:ba].target.measurement.self_time = 0.7
-  call_trees[:ba].target.measurement.wait_time = 0.2
-  call_trees[:bb].target.measurement.total_time = 2.3
-  call_trees[:bb].target.measurement.self_time = 2.3
-  call_trees[:b].target.measurement.total_time = 3.2
-
-  call_trees[:root].measurement.total_time = 3.6
-  call_trees[:root].target.measurement.total_time = 3.6
-
-  call_trees[:root]
-end
+# frozen_string_literal: true
+
+require File.expand_path('../test_helper', __FILE__)
+require 'base64'
+
+# Create a DummyClass with methods so we can create call trees in the test_merge method below
+class DummyClass
+  %i[root a b aa ab ba bb].each do |method_name|
+    define_method(method_name) do
+    end
+  end
+end
+
+def create_call_tree(method_name)
+  method_info = RubyProf::MethodInfo.new(DummyClass, method_name)
+  RubyProf::CallTree.new(method_info)
+end
+
+def build_call_tree(tree_hash)
+  # tree_hash is a hash keyed on the parent method_name whose values are
+  # child methods. Example:
+  #
+  # tree_hash = {root: [:a, :b],
+  #              a: [:aa, :ab],
+  #              b: [:bb]}
+  #
+  # Note this is a simplified structure for testing. It assumes methods
+  # are only called from one call_tree.
+
+  call_trees = Hash.new
+  tree_hash.each do |method_name, children|
+    parent = call_trees[method_name] ||= create_call_tree(method_name)
+    children.each do |child_method_name|
+      child = call_trees[child_method_name] ||= create_call_tree(child_method_name)
+      parent.add_child(child)
+    end
+  end
+
+  call_trees
+end
+
+def create_call_tree_1
+  #
+  #          root    
+  #        /     \   
+  #       a       b  
+  #     /  \       \ 
+  #   aa   ab      bb
+  #
+
+  # ------ Call Trees 1 -------------
+  tree_hash = {root: [:a, :b],
+               a: [:aa, :ab],
+               b: [:bb]}
+
+  call_trees = build_call_tree(tree_hash)
+
+  # Setup times
+  call_trees[:aa].measurement.total_time = 1.5
+  call_trees[:aa].measurement.self_time = 1.5
+  call_trees[:ab].measurement.total_time = 2.2
+  call_trees[:ab].measurement.self_time = 2.2
+  call_trees[:a].measurement.total_time = 3.7
+
+  call_trees[:aa].target.measurement.total_time = 1.5
+  call_trees[:aa].target.measurement.self_time = 1.5
+  call_trees[:ab].target.measurement.total_time = 2.2
+  call_trees[:ab].target.measurement.self_time = 2.2
+  call_trees[:a].target.measurement.total_time = 3.7
+
+  call_trees[:bb].measurement.total_time = 4.3
+  call_trees[:bb].measurement.self_time = 4.3
+  call_trees[:b].measurement.total_time = 4.3
+
+  call_trees[:bb].target.measurement.total_time = 4.3
+  call_trees[:bb].target.measurement.self_time = 4.3
+  call_trees[:b].target.measurement.total_time = 4.3
+
+  call_trees[:root].measurement.total_time = 8.0
+  call_trees[:root].target.measurement.total_time = 8.0
+
+  call_trees[:root]
+end
+
+def create_call_tree_2
+  #
+  #      root
+  #    /     \
+  #   a       b
+  #    \     / \
+  #    ab  ba  bb
+
+  tree_hash = {root: [:a, :b],
+               a: [:ab],
+               b: [:ba, :bb]}
+
+  call_trees = build_call_tree(tree_hash)
+
+  # Setup times
+  call_trees[:ab].measurement.total_time = 0.4
+  call_trees[:ab].measurement.self_time = 0.4
+  call_trees[:a].measurement.total_time = 0.4
+
+  call_trees[:ab].target.measurement.total_time = 0.4
+  call_trees[:ab].target.measurement.self_time = 0.4
+  call_trees[:a].target.measurement.total_time = 0.4
+
+  call_trees[:ba].measurement.total_time = 0.9
+  call_trees[:ba].measurement.self_time = 0.7
+  call_trees[:ba].measurement.wait_time = 0.2
+  call_trees[:bb].measurement.total_time = 2.3
+  call_trees[:bb].measurement.self_time = 2.3
+  call_trees[:b].measurement.total_time = 3.2
+
+  call_trees[:ba].target.measurement.total_time = 0.9
+  call_trees[:ba].target.measurement.self_time = 0.7
+  call_trees[:ba].target.measurement.wait_time = 0.2
+  call_trees[:bb].target.measurement.total_time = 2.3
+  call_trees[:bb].target.measurement.self_time = 2.3
+  call_trees[:b].target.measurement.total_time = 3.2
+
+  call_trees[:root].measurement.total_time = 3.6
+  call_trees[:root].target.measurement.total_time = 3.6
+
+  call_trees[:root]
+end

data/test/exceptions_test.rb

@@ -1,24 +1,24 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class ExceptionsTest < TestCase
-  def test_profile
-    result = begin
-      RubyProf::Profile.profile do
-        raise(RuntimeError, 'Test error')
-      end
-    rescue
-    end
-    assert_kind_of(RubyProf::Profile, result)
-  end
-
-  def test_profile_allows_exceptions
-    assert_raises(RuntimeError) do
-      RubyProf::Profile.profile(allow_exceptions: true) do
-        raise(RuntimeError, 'Test error')
-      end
-    end
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class ExceptionsTest < TestCase
+  def test_profile
+    result = begin
+      RubyProf::Profile.profile do
+        raise(RuntimeError, 'Test error')
+      end
+    rescue
+    end
+    assert_kind_of(RubyProf::Profile, result)
+  end
+
+  def test_profile_allows_exceptions
+    assert_raises(RuntimeError) do
+      RubyProf::Profile.profile(allow_exceptions: true) do
+        raise(RuntimeError, 'Test error')
+      end
+    end
+  end
+end

data/test/marshal_test.rb

@@ -1,144 +1,144 @@
-#!/usr/bin/env ruby
-# encoding: UTF-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)
-    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_call_info(thread_1.call_tree, thread_2.call_tree)
-
-      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?)
-
-      if method_1.source_file
-        assert_equal(method_1.source_file, method_2.source_file)
-      else
-        assert_nil(method_1.source_file)
-        assert_nil(method_2.source_file)
-      end
-
-      assert_equal(method_1.line, method_2.line)
-
-      verify_measurement(method_1.measurement, method_2.measurement)
-      verify_call_infos(method_1.call_trees, method_2.call_trees)
-      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.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.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.target, call_info_2.target)
-
-    if call_info_1.parent&.target
-      assert_equal(call_info_1.parent&.target, call_info_2.parent&.target)
-    else
-      assert_nil(call_info_1.parent&.target)
-      assert_nil(call_info_2.parent&.target)
-    end
-
-    assert_equal(call_info_1.depth, call_info_2.depth)
-
-    if call_info_1.source_file
-      assert_equal(call_info_1.source_file, call_info_2.source_file) #
-    else
-      assert_nil(call_info_1.source_file)
-      assert_nil(call_info_2.source_file)
-    end
-
-    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_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
-
-    data = Marshal.dump(profile_1)
-    profile_2 = Marshal.load(data)
-
-    verify_profile(profile_1, profile_2)
-  end
-
-  def test_singleton
-    profile_1 = RubyProf::Profile.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
+#!/usr/bin/env ruby
+# encoding: UTF-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)
+    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_call_info(thread_1.call_tree, thread_2.call_tree)
+
+      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?)
+
+      if method_1.source_file
+        assert_equal(method_1.source_file, method_2.source_file)
+      else
+        assert_nil(method_1.source_file)
+        assert_nil(method_2.source_file)
+      end
+
+      assert_equal(method_1.line, method_2.line)
+
+      verify_measurement(method_1.measurement, method_2.measurement)
+      verify_call_infos(method_1.call_trees, method_2.call_trees)
+      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.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.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.target, call_info_2.target)
+
+    if call_info_1.parent&.target
+      assert_equal(call_info_1.parent&.target, call_info_2.parent&.target)
+    else
+      assert_nil(call_info_1.parent&.target)
+      assert_nil(call_info_2.parent&.target)
+    end
+
+    assert_equal(call_info_1.depth, call_info_2.depth)
+
+    if call_info_1.source_file
+      assert_equal(call_info_1.source_file, call_info_2.source_file) #
+    else
+      assert_nil(call_info_1.source_file)
+      assert_nil(call_info_2.source_file)
+    end
+
+    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_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
+
+    data = Marshal.dump(profile_1)
+    profile_2 = Marshal.load(data)
+
+    verify_profile(profile_1, profile_2)
+  end
+
+  def test_singleton
+    profile_1 = RubyProf::Profile.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

data/test/printer_call_stack_test.rb

@@ -1,28 +1,28 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-require 'fileutils'
-require 'stringio'
-require 'tmpdir'
-require_relative 'prime'
-
-# --  Tests ----
-class PrinterCallStackTest < TestCase
-  def setup
-    super
-    # WALL_TIME so we can use sleep in our test and get same measurements on linux and windows
-    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
-      run_primes(1000, 5000)
-    end
-  end
-
-  def test_graph_html_string
-    output = StringIO.new
-    printer = RubyProf::CallStackPrinter.new(@result)
-    printer.print(output)
-
-    assert_match(/<!DOCTYPE html>/i, output.string)
-    assert_match(/Object#run_primes/i, output.string)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+require 'fileutils'
+require 'stringio'
+require 'tmpdir'
+require_relative 'prime'
+
+# --  Tests ----
+class PrinterCallStackTest < TestCase
+  def setup
+    super
+    # WALL_TIME so we can use sleep in our test and get same measurements on linux and windows
+    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+      run_primes(1000, 5000)
+    end
+  end
+
+  def test_graph_html_string
+    output = StringIO.new
+    printer = RubyProf::CallStackPrinter.new(@result)
+    printer.print(output)
+
+    assert_match(/<!DOCTYPE html>/i, output.string)
+    assert_match(/Object#run_primes/i, output.string)
+  end
+end