RubyGems - ruby-prof - Versions diffs - 1.7.1 → 1.7.2 - Mend

ruby-prof 1.7.1 → 1.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

checksums.yaml +4 -4
data/CHANGES +8 -0
data/ext/ruby_prof/extconf.rb +23 -22
data/ext/ruby_prof/rp_call_trees.c +296 -296
data/ext/ruby_prof/rp_call_trees.h +28 -28
data/ext/ruby_prof/rp_measure_allocations.c +47 -47
data/ext/ruby_prof/rp_measure_process_time.c +64 -66
data/ext/ruby_prof/rp_measure_wall_time.c +52 -64
data/ext/ruby_prof/rp_method.c +551 -551
data/ext/ruby_prof/rp_stack.c +212 -212
data/ext/ruby_prof/ruby_prof.c +50 -50
data/ext/ruby_prof/ruby_prof.h +3 -2
data/ext/ruby_prof/vc/ruby_prof.vcxproj +3 -3
data/lib/ruby-prof/compatibility.rb +113 -113
data/lib/ruby-prof/exclude_common_methods.rb +204 -204
data/lib/ruby-prof/printers/abstract_printer.rb +156 -138
data/lib/ruby-prof/version.rb +3 -3
data/ruby-prof.gemspec +66 -65
data/test/dynamic_method_test.rb +9 -21
data/test/enumerable_test.rb +23 -21
data/test/exclude_methods_test.rb +363 -257
data/test/fiber_test.rb +195 -195
data/test/gc_test.rb +104 -102
data/test/line_number_test.rb +426 -289
data/test/measure_allocations_test.rb +1172 -1081
data/test/measure_memory_test.rb +1193 -1456
data/test/measure_process_time_test.rb +3330 -2477
data/test/measure_wall_time_test.rb +634 -568
data/test/merge_test.rb +146 -146
data/test/method_info_test.rb +100 -95
data/test/printers_test.rb +178 -135
data/test/recursive_test.rb +796 -622
data/test/start_stop_test.rb +4 -4
data/test/test_helper.rb +20 -20
data/test/thread_test.rb +229 -231
data/test/unique_call_path_test.rb +9 -22
data/test/yarv_test.rb +1 -5
metadata +19 -9
data/test/crash2.rb +0 -144

data/test/printers_test.rb CHANGED Viewed

@@ -1,135 +1,178 @@
-#!/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 PrintersTest < 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_printers
-    output = ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT'] == "1" ? STDOUT : StringIO.new('')
-    printer = RubyProf::CallStackPrinter.new(@result)
-    printer.print(output)
-    printer = RubyProf::CallTreePrinter.new(@result)
-    printer.print(:path => Dir.tmpdir)
-    printer = RubyProf::FlatPrinter.new(@result)
-    printer.print(output)
-    printer = RubyProf::GraphHtmlPrinter.new(@result)
-    printer.print(output)
-    printer = RubyProf::GraphPrinter.new(@result)
-    printer.print(output)
-  end
-  def test_print_to_files
-    printer = RubyProf::DotPrinter.new(@result)
-    File.open("#{Dir.tmpdir}/graph.dot", "w") {|f| printer.print(f)}
-    printer = RubyProf::CallStackPrinter.new(@result)
-    File.open("#{Dir.tmpdir}/stack.html", "w") {|f| printer.print(f, :application => "primes")}
-    printer = RubyProf::MultiPrinter.new(@result)
-    printer.print(:path => Dir.tmpdir, :profile => "multi", :application => "primes")
-    ['graph.dot', 'multi.flat.txt', 'multi.graph.html', "multi.callgrind.out.#{$$}", 'multi.stack.html', 'stack.html'].each do |file_name|
-      file_path = File.join(Dir.tmpdir, file_name)
-      refute(File.empty?(file_path))
-    end
-  end
-  def test_refuses_io_objects
-    p = RubyProf::MultiPrinter.new(@result)
-    begin
-      p.print(STDOUT)
-      flunk "should have raised an ArgumentError"
-    rescue ArgumentError => e
-      assert_match(/IO/, e.to_s)
-    end
-  end
-  def test_refuses_non_hashes
-    p = RubyProf::MultiPrinter.new (@result)
-    begin
-      p.print([])
-      flunk "should have raised an ArgumentError"
-    rescue ArgumentError => e
-      assert_match(/hash/, e.to_s)
-    end
-  end
-  def test_flat_string
-    output = helper_test_flat_string(RubyProf::FlatPrinter)
-    assert_match(/prime.rb/, output)
-  end
-  def helper_test_flat_string(klass)
-    output = ''
-    printer = klass.new(@result)
-    printer.print(output)
-    assert_match(/Thread ID: -?\d+/i, output)
-    assert_match(/Fiber ID: -?\d+/i, output)
-    assert_match(/Total: \d+\.\d+/i, output)
-    assert_match(/Object#run_primes/i, output)
-    output
-  end
-  def test_graph_html_string
-    output = ''
-    printer = RubyProf::GraphHtmlPrinter.new(@result)
-    printer.print(output)
-    assert_match(/<!DOCTYPE html>/i, output)
-    assert_match( %r{<th>Total</th>}i, output)
-    assert_match(/Object#run_primes/i, output)
-  end
-  def test_graph_string
-    output = ''
-    printer = RubyProf::GraphPrinter.new(@result)
-    printer.print(output)
-    assert_match(/Thread ID: -?\d+/i, output)
-    assert_match(/Fiber ID: -?\d+/i, output)
-    assert_match(/Total Time: \d+\.\d+/i, output)
-    assert_match(/Object#run_primes/i, output)
-  end
-  def do_nothing
-    start = Time.now
-    while(Time.now == start)
-    end
-  end
-  def test_all_with_small_percentiles
-    result = RubyProf::Profile.profile do
-      sleep 2
-      do_nothing
-    end
-    # RubyProf::CallTreePrinter doesn't "do" a min_percent
-    # RubyProf::FlatPrinter only outputs if self time > percent...
-    for klass in [RubyProf::GraphPrinter, RubyProf::GraphHtmlPrinter]
-      printer = klass.new(result)
-      out = ''
-      printer.print(out, :min_percent => 0.00000001)
-      assert_match(/do_nothing/, out)
-    end
-  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 PrintersTest < TestCase
+  def setup
+    super
+    # WALL_TIME, PROCESS_TIME, ALLOCATIONS and MEMORY as types of measuremen
+    measure_modes = {wall_time: RubyProf::WALL_TIME, process_time: RubyProf::PROCESS_TIME, allocations: RubyProf::ALLOCATIONS, memory: RubyProf::MEMORY}
+    @results = {}
+    measure_modes.each do |key, value|
+      @results[key] = RubyProf::Profile.profile(measure_mode: value) do
+        run_primes(1000, 5000)
+      end
+    end
+  end
+  def test_printers
+    output = ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT'] == "1" ? STDOUT : StringIO.new('')
+    printer = RubyProf::CallStackPrinter.new(@results[:wall_time])
+    printer.print(output)
+    printer = RubyProf::CallTreePrinter.new(@results[:wall_time])
+    printer.print(:path => Dir.tmpdir)
+    printer = RubyProf::FlatPrinter.new(@results[:wall_time])
+    printer.print(output)
+    printer = RubyProf::GraphHtmlPrinter.new(@results[:wall_time])
+    printer.print(output)
+    printer = RubyProf::GraphPrinter.new(@results[:wall_time])
+    printer.print(output)
+  end
+  def test_print_to_files
+    printer = RubyProf::DotPrinter.new(@results[:wall_time])
+    File.open("#{Dir.tmpdir}/graph.dot", "w") {|f| printer.print(f)}
+    printer = RubyProf::CallStackPrinter.new(@results[:wall_time])
+    File.open("#{Dir.tmpdir}/stack.html", "w") {|f| printer.print(f, :application => "primes")}
+    printer = RubyProf::MultiPrinter.new(@results[:wall_time])
+    printer.print(:path => Dir.tmpdir, :profile => "multi", :application => "primes")
+    ['graph.dot', 'multi.flat.txt', 'multi.graph.html', "multi.callgrind.out.#{$$}", 'multi.stack.html', 'stack.html'].each do |file_name|
+      file_path = File.join(Dir.tmpdir, file_name)
+      refute(File.empty?(file_path))
+    end
+  end
+  def test_refuses_io_objects
+    p = RubyProf::MultiPrinter.new(@results[:wall_time])
+    begin
+      p.print(STDOUT)
+      flunk "should have raised an ArgumentError"
+    rescue ArgumentError => e
+      assert_match(/IO/, e.to_s)
+    end
+  end
+  def test_refuses_non_hashes
+    p = RubyProf::MultiPrinter.new (@results[:wall_time])
+    begin
+      p.print([])
+      flunk "should have raised an ArgumentError"
+    rescue ArgumentError => e
+      assert_match(/hash/, e.to_s)
+    end
+  end
+  def test_flat_string
+    output = helper_test_flat_string(RubyProf::FlatPrinter)
+    assert_match(/prime.rb/, output)
+  end
+  def helper_test_flat_string(klass)
+    output = ''
+    printer = klass.new(@results[:wall_time])
+    printer.print(output)
+    assert_match(/Thread ID: -?\d+/i, output)
+    assert_match(/Fiber ID: -?\d+/i, output)
+    assert_match(/Total: \d+\.\d+/i, output)
+    assert_match(/Object#run_primes/i, output)
+    output
+  end
+  def test_graph_html_string
+    output = ''
+    printer = RubyProf::GraphHtmlPrinter.new(@results[:wall_time])
+    printer.print(output)
+    assert_match(/<!DOCTYPE html>/i, output)
+    assert_match( %r{<th>Total</th>}i, output)
+    assert_match(/Object#run_primes/i, output)
+  end
+  def test_graph_string
+    output = ''
+    printer = RubyProf::GraphPrinter.new(@results[:wall_time])
+    printer.print(output)
+    assert_match(/Thread ID: -?\d+/i, output)
+    assert_match(/Fiber ID: -?\d+/i, output)
+    assert_match(/Total Time: \d+\.\d+/i, output)
+    assert_match(/Object#run_primes/i, output)
+  end
+  def do_nothing
+    start = Time.now
+    while(Time.now == start)
+    end
+  end
+  def test_all_with_small_percentiles
+    result = RubyProf::Profile.profile do
+      sleep 2
+      do_nothing
+    end
+    # RubyProf::CallTreePrinter doesn't "do" a min_percent
+    # RubyProf::FlatPrinter only outputs if self time > percent...
+    for klass in [RubyProf::GraphPrinter, RubyProf::GraphHtmlPrinter]
+      printer = klass.new(result)
+      out = ''
+      printer.print(out, :min_percent => 0.00000001)
+      assert_match(/do_nothing/, out)
+    end
+  end
+  def test_print_footer
+    results_keys = [:wall_time, :process_time, :allocations, :memory]
+    expected_matches = [
+      "The percentage of time spent by this method relative to the total time in the entire program.",
+      "The total time spent by this method and its children.",
+      "The time spent by this method.",
+      "The time spent by this method's children.",
+      "The percentage of allocations made by this method relative to the total allocations in the entire program.",
+      "The total number of allocations made by this method and its children.",
+      "The number of allocations made by this method.",
+      "The number of allocations made by this method's children.",
+      "The percentage of memory used by this method relative to the total memory in the entire program.",
+      "The total memory used by this method and its children.",
+      "The memory used by this method.",
+      "The memory used by this method's children."
+    ]
+    results_keys.each do |key|
+      output = ''
+      printer = RubyProf::GraphPrinter.new(@results[key])
+      printer.print(output)
+      case key
+      when :wall_time, :process_time
+        matches = expected_matches[0..3]
+      when :allocations
+        matches = expected_matches[4..7]
+      when :memory
+        matches = expected_matches[8..11]
+      end
+      matches.each do |pattern|
+        assert_match(pattern, output)
+      end
+    end
+  end
+end