ruby-prof 1.7.1 → 1.7.2

data/test/fiber_test.rb

@@ -1,195 +1,195 @@
-#!/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 enumerator_with_fibers
-    enum = Enumerator.new do |yielder|
-      [1,2].each do |x|
-        yielder.yield x
-      end
-    end
-
-    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 test_fibers
-    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) { 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)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[1]
-    assert_equal('FiberTest#enumerator_with_fibers', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[2]
-    assert_equal('Enumerator#next', method.full_name)
-    assert_equal(2, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[3]
-    assert_equal('Class#new', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[4]
-    assert_equal('Enumerator#initialize', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    thread2 = result.threads[1]
-    methods = thread2.methods.sort.reverse
-    assert_equal(4, methods.count)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[0]
-    assert_equal('Enumerator#each', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[1]
-    assert_equal('Enumerator::Generator#each', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[2]
-    assert_equal('Array#each', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[3]
-    assert_equal('Enumerator::Yielder#yield', method.full_name)
-    assert_equal(2, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-  end
-
-  def test_fiber_resume
-    result  = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) { 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)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[1]
-    assert_equal('FiberTest#fiber_yield_resume', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[2]
-    assert_equal('Fiber#resume', method.full_name)
-    assert_equal(2, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[3]
-    assert_equal('Class#new', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[4]
-    assert_equal('Fiber#initialize', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    thread1 = result.threads[1]
-    methods = thread1.methods.sort.reverse
-    assert_equal(2, methods.count)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[0]
-    assert_equal('FiberTest#fiber_yield_resume', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-
-    method = methods[1]
-    assert_equal('<Class::Fiber>#yield', method.full_name)
-    assert_equal(2, method.called)
-    assert_in_delta(0, method.total_time)
-    assert_in_delta(0, method.self_time)
-    assert_in_delta(0, method.wait_time)
-    assert_in_delta(0, method.children_time)
-  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 enumerator_with_fibers
+    enum = Enumerator.new do |yielder|
+      [1,2].each do |x|
+        yielder.yield x
+      end
+    end
+
+    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 test_fibers
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) { 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)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[1]
+    assert_equal('FiberTest#enumerator_with_fibers', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[2]
+    assert_equal('Enumerator#next', method.full_name)
+    assert_equal(2, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[3]
+    assert_equal('Class#new', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[4]
+    assert_equal('Enumerator#initialize', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    thread2 = result.threads[1]
+    methods = thread2.methods.sort.reverse
+    assert_equal(4, methods.count)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[0]
+    assert_equal('Enumerator#each', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[1]
+    assert_equal('Enumerator::Generator#each', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[2]
+    assert_equal('Array#each', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[3]
+    assert_equal('Enumerator::Yielder#yield', method.full_name)
+    assert_equal(2, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+  end
+
+  def test_fiber_resume
+    result  = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) { 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)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[1]
+    assert_equal('FiberTest#fiber_yield_resume', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[2]
+    assert_equal('Fiber#resume', method.full_name)
+    assert_equal(2, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[3]
+    assert_equal('Class#new', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[4]
+    assert_equal('Fiber#initialize', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    thread1 = result.threads[1]
+    methods = thread1.methods.sort.reverse
+    assert_equal(2, methods.count)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[0]
+    assert_equal('FiberTest#fiber_yield_resume', method.full_name)
+    assert_equal(1, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+
+    method = methods[1]
+    assert_equal('<Class::Fiber>#yield', method.full_name)
+    assert_equal(2, method.called)
+    assert_in_delta(0, method.total_time)
+    assert_in_delta(0, method.self_time)
+    assert_in_delta(0, method.wait_time)
+    assert_in_delta(0, method.children_time)
+  end
+end

data/test/gc_test.rb

@@ -1,102 +1,104 @@
-#!/usr/bin/env ruby
-# 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
-    super
-    GC.stress = true
-  end
-
-  def teardown
-    GC.stress = false
-  end
-
-  def some_method
-    Array.new(3 * 4)
-  end
-
-  def run_profile
-    RubyProf::Profile.profile do
-      self.some_method
-    end
-  end
-
-  def test_hold_onto_thread
-    threads = 5.times.reduce(Array.new) do |array, i|
-      array.concat(run_profile.threads)
-      array
-    end
-
-    GC.start
-
-    threads.each do |thread|
-      refute_nil(thread.id)
-    end
-  end
-
-  def test_hold_onto_method
-    methods = 5.times.reduce(Array.new) do |array, i|
-      profile = run_profile
-      array.concat(profile.threads.map(&:methods).flatten)
-      array
-    end
-
-    GC.start
-
-    methods.each do |method|
-      refute_nil(method.method_name)
-    end
-  end
-
-  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
-
-    GC.start
-
-    method_call_infos.each do |call_trees|
-      refute_empty(call_trees.call_trees)
-    end
-  end
-
-  def test_hold_onto_measurements
-    # Run a profile
-    profile = run_profile
-
-    # Get measurement objects
-    measurements = profile.threads.map(&:methods).flatten.map(&:measurement)
-
-    # Free the profiles which frees the measurements
-    profile = nil
-
-    GC.start
-
-    measurements.each_with_index do |measurement|
-      error = assert_raises(RuntimeError) do
-        measurement.total_time
-      end
-      assert_match(/RubyProf::Measurement instance has already been freed/, error.message)
-    end
-    assert(true)
-  end
-
-  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
-
-    GC.start
-
-    call_trees.each do |call_tree|
-      refute_nil(call_tree.source_file)
-    end
-  end
-end
+#!/usr/bin/env ruby
+# 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
+    super
+    GC.stress = true
+  end
+
+  def teardown
+    GC.stress = false
+  end
+
+  def some_method
+    Array.new(3 * 4)
+  end
+
+  def run_profile
+    RubyProf::Profile.profile do
+      self.some_method
+    end
+  end
+
+  def test_hold_onto_thread
+    threads = 5.times.reduce(Array.new) do |array, i|
+      array.concat(run_profile.threads)
+      array
+    end
+
+    GC.start
+
+    threads.each do |thread|
+      refute_nil(thread.id)
+    end
+  end
+
+  def test_hold_onto_method
+    methods = 5.times.reduce(Array.new) do |array, i|
+      profile = run_profile
+      array.concat(profile.threads.map(&:methods).flatten)
+      array
+    end
+
+    GC.start
+
+    methods.each do |method|
+      refute_nil(method.method_name)
+    end
+  end
+
+  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
+
+    GC.start
+
+    method_call_infos.each do |call_trees|
+      refute_empty(call_trees.call_trees)
+    end
+  end
+
+unless windows?
+  def test_hold_onto_measurements
+    # Run a profile
+    profile = run_profile
+
+    # Get measurement objects
+    measurements = profile.threads.map(&:methods).flatten.map(&:measurement)
+
+    # Free the profiles which frees the measurements
+    profile = nil
+
+    GC.start
+
+    measurements.each_with_index do |measurement|
+      error = assert_raises(RuntimeError) do
+        measurement.total_time
+      end
+      assert_match(/RubyProf::Measurement instance has already been freed/, error.message)
+    end
+    assert(true)
+  end
+end
+
+  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
+
+    GC.start
+
+    call_trees.each do |call_tree|
+      refute_nil(call_tree.source_file)
+    end
+  end
+end