ruby-prof 0.13.1 → 0.14.0

data/test/call_info_visitor_test.rb

@@ -1,31 +1,31 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class CallInfoVisitorTest < Test::Unit::TestCase
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
-  def test_visit
-    result = RubyProf.profile do
-      RubyProf::C1.hello
-    end
-
-    visitor = RubyProf::CallInfoVisitor.new(result.threads.first)
-
-    method_names = Array.new
-
-    visitor.visit do |call_info, event|
-      method_names << call_info.target.full_name if event == :enter
-    end
-
-    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("Kernel#sleep", method_names[2])
-  end
-end
-
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class CallInfoVisitorTest < Test::Unit::TestCase
+  def setup
+    # Need to use wall time for this test due to the sleep calls
+    RubyProf::measure_mode = RubyProf::WALL_TIME
+  end
+
+  def test_visit
+    result = RubyProf.profile do
+      RubyProf::C1.hello
+    end
+
+    visitor = RubyProf::CallInfoVisitor.new(result.threads.first)
+
+    method_names = Array.new
+
+    visitor.visit do |call_info, event|
+      method_names << call_info.target.full_name if event == :enter
+    end
+
+    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("Kernel#sleep", method_names[2])
+  end
+end
+

data/test/fiber_test.rb

@@ -23,7 +23,7 @@ class FiberTest < Test::Unit::TestCase
       end
     while true
       begin
-        x = enum.next
+        enum.next
       rescue StopIteration
         break
       end
@@ -62,4 +62,4 @@ class FiberTest < Test::Unit::TestCase
     # RubyProf::CallInfoPrinter.new(@result).print
   end
 
-end if RUBY_VERSION >= "1.9"
+end

data/test/measure_gc_runs_test.rb

@@ -20,7 +20,7 @@ class MeasureGCRunsTest < Test::Unit::TestCase
       t = RubyProf.measure_gc_runs
       assert_kind_of Integer, t
 
-      GC.enable_stats
+      GC.enable_stats if GC.respond_to?(:enable_stats)
       GC.start
 
       u = RubyProf.measure_gc_runs

data/test/measure_process_time_test.rb

@@ -31,14 +31,15 @@ class MeasureProcessTimeTest < Test::Unit::TestCase
 
     methods = result.threads.first.methods.sort.reverse
 
-    if RUBY_VERSION =~ /^1\.8/
-      methods.reject!{|m| m.full_name =~ /^Fixnum/ || m.full_name == 'Object#find_largest'}
-    end
-    if RUBY_VERSION =~ /^(1\.9\.2|2\.0)/
-      assert_equal 15, methods.length
-    else
+    # WTF?
+    if RUBY_VERSION =~ /^1\.9\.3/
       assert_equal 16, methods.length
+    elsif RUBY_VERSION =~ /^2\.0/
+      assert_equal 15, methods.length
+    else # if RUBY_VERSION =~ /^2\.1/
+      assert_equal 14, methods.length
     end
+    # puts methods.map(&:full_name).inspect
 
     # Check times
     assert_equal("MeasureProcessTimeTest#test_primes", methods[0].full_name)

data/test/printers_test.rb

@@ -75,7 +75,7 @@ class PrintersTest < Test::Unit::TestCase
     printer.print(output)
 
     assert_match(/Thread ID: -?\d+/i, output)
-    assert_match(/Fiber ID: -?\d+/i, output) unless RUBY_VERSION =~ /^1.8/
+    assert_match(/Fiber ID: -?\d+/i, output)
     assert_match(/Total: \d+\.\d+/i, output)
     assert_match(/Object#run_primes/i, output)
     output
@@ -88,12 +88,8 @@ class PrintersTest < Test::Unit::TestCase
     assert_match(/called from/, output)
 
     # should combine common parents
-    if RUBY_VERSION < '1.9'
-      assert_equal(3, output.scan(/Object#is_prime/).length)
-    else
-      # 1.9 inlines it's  Fixnum#- so we don't see as many
-      assert_equal(2, output.scan(/Object#is_prime/).length)
-    end
+    # 1.9 inlines it's  Fixnum#- so we don't see as many
+    assert_equal(2, output.scan(/Object#is_prime/).length)
     assert_no_match(/\.\/test\/prime.rb/, output) # don't use relative paths
   end
 
@@ -113,7 +109,7 @@ class PrintersTest < Test::Unit::TestCase
     printer.print(output)
 
     assert_match(/Thread ID: -?\d+/i, output)
-    assert_match(/Fiber ID: -?\d+/i, output) unless RUBY_VERSION =~ /^1.8/
+    assert_match(/Fiber ID: -?\d+/i, output)
     assert_match(/Total Time: \d+\.\d+/i, output)
     assert_match(/Object#run_primes/i, output)
   end

data/test/recursive_test.rb

@@ -111,11 +111,7 @@ class RecursiveTest < Test::Unit::TestCase
     end
 
     methods = result.threads.first.methods.sort.reverse
-    if RUBY_VERSION < '1.9' # Fixnum#+, Fixnum#===, Kernel#===
-      assert_equal(8, methods.length)
-    else
-      assert_equal(5, methods.length)
-    end
+    assert_equal(5, methods.length)
 
     method = methods[0]
     assert_equal('RecursiveTest#test_cycle', method.full_name)
@@ -161,7 +157,7 @@ class RecursiveTest < Test::Unit::TestCase
 
     call_info = method.call_infos[1]
     assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Integer#times', call_info.call_sequence)
-    assert_equal(1 + (RUBY_VERSION < '1.9.0' ? 1 : 0), call_info.children.length)
+    assert_equal(1, call_info.children.length)
     assert(call_info.recursive)
 
     method = methods[3]
@@ -175,17 +171,17 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal(3, method.call_infos.length)
     call_info = method.call_infos[0]
     assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial', call_info.call_sequence)
-    assert_equal(3 + (RUBY_VERSION < '1.9.0' ? 1 : 0), call_info.children.length)
+    assert_equal(3, call_info.children.length)
     assert(!call_info.recursive)
 
     call_info = method.call_infos[1]
     assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Object#render_partial', call_info.call_sequence)
-    assert_equal(1 + (RUBY_VERSION < '1.9.0' ? 1 : 0), call_info.children.length)
+    assert_equal(1, call_info.children.length)
     assert(call_info.recursive)
 
     call_info = method.call_infos[2]
     assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Integer#times->Object#render_partial', call_info.call_sequence)
-    assert_equal(1 + (RUBY_VERSION < '1.9.0' ? 1 : 0), call_info.children.length)
+    assert_equal(1, call_info.children.length)
     assert(call_info.recursive)
 
     method = methods[4]

data/test/test_helper.rb

@@ -13,7 +13,7 @@ if ENV["RM_INFO"] || ENV["TEAMCITY_VERSION"]
   MiniTest::Reporters.use!
 end
 
-require "minitest/pride"
+require "minitest/pride" if RUBY_VERSION == "1.9.3"
 
 # To make testing/debugging easier, test within this source tree versus an installed gem
 dir = File.dirname(__FILE__)

data/test/unique_call_path_test.rb

@@ -121,24 +121,14 @@ class UniqueCallPathTest < Test::Unit::TestCase
       end
     end
 
-    if RUBY_VERSION < '1.9'
-      assert_equal(4, call_info_a.target.children.length)
-    else
-      assert_equal(2, call_info_a.target.children.length)
-    end
+    assert_equal(2, call_info_a.target.children.length)
 
     children_of_a = children_of_a.sort do |c1, c2|
       c1.target.full_name <=> c2.target.full_name
     end
-    if RUBY_VERSION < '1.9'
-      assert_equal(2, children_of_a.length)
-      assert_equal("Fixnum#==", children_of_a[0].target.full_name)
-      assert_equal("UniqueCallPath#method_b", children_of_a[1].target.full_name)
-    else
-      assert_equal(1, children_of_a.length)
-      assert_equal("UniqueCallPath#method_b", children_of_a[0].target.full_name)
-    end
 
+    assert_equal(1, children_of_a.length)
+    assert_equal("UniqueCallPath#method_b", children_of_a[0].target.full_name)
   end
 
   def test_id2ref
@@ -199,26 +189,14 @@ class UniqueCallPathTest < Test::Unit::TestCase
       end
     end
 
-    if RUBY_VERSION < '1.9'
-      assert_equal(4, call_info_a.target.children.length)
-    else
-      assert_equal(2, call_info_a.target.children.length)
-    end
+    assert_equal(2, call_info_a.target.children.length)
 
     children_of_a = children_of_a.sort do |c1, c2|
       c1.target.full_name <=> c2.target.full_name
     end
 
-    if RUBY_VERSION < '1.9'
-      assert_equal(2, children_of_a.length)
-      assert_equal(1, children_of_a[0].called)
-      assert_equal("Fixnum#==", children_of_a[0].target.full_name)
-      assert_equal(1, children_of_a[1].called)
-      assert_equal("UniqueCallPath#method_b", children_of_a[1].target.full_name)
-    else
-      assert_equal(1, children_of_a.length)
-      assert_equal(1, children_of_a[0].called)
-      assert_equal("UniqueCallPath#method_b", children_of_a[0].target.full_name)
-    end
+    assert_equal(1, children_of_a.length)
+    assert_equal(1, children_of_a[0].called)
+    assert_equal("UniqueCallPath#method_b", children_of_a[0].target.full_name)
   end
 end

data/test/yarv_test.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+# tests for bugs reported by users
+class BugsTest < Test::Unit::TestCase
+  def setup
+    RubyProf::measure_mode = RubyProf::WALL_TIME
+    define_methods
+  end
+
+  def test_array_push_unoptimized
+    a = nil
+    result = RubyProf.profile do
+      a = self.array_push_unoptimized
+    end
+    assert_equal 2, a.length
+    assert_equal ["BugsTest#test_array_push_unoptimized", "BugsTest#array_push_unoptimized", 'Array#<<', "Array#push"], result.threads.first.methods.map(&:full_name)
+  end
+
+  def test_array_push_optimized
+    a = nil
+    result = RubyProf.profile do
+      a = self.array_push_optimized
+    end
+    assert_equal 2, a.length
+    assert_equal ["BugsTest#test_array_push_optimized", "BugsTest#array_push_optimized", "Array#push"], result.threads.first.methods.map(&:full_name)
+  end
+
+  private
+  def define_methods
+    return if respond_to?(:array_push_optimized)
+    old_compile_option = RubyVM::InstructionSequence.compile_option
+    RubyVM::InstructionSequence.compile_option = {
+      :trace_instruction => true,
+      :specialized_instruction => false
+    }
+    self.class.class_eval <<-"EOM"
+      def array_push_unoptimized
+        a = []
+        a << 1
+        a.push 2
+      end
+    EOM
+    RubyVM::InstructionSequence.compile_option = old_compile_option
+    self.class.class_eval <<-"EOM"
+      def array_push_optimized
+        a = []
+        a << 1
+        a.push 2
+      end
+    EOM
+  end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -62,20 +62,54 @@ description: |
 email: shugo@ruby-lang.org, cfis@savagexi.com, rogerdpack@gmail.com, skaes@railsexpress.de
 executables:
 - ruby-prof
+- ruby-prof-check-trace
 extensions:
 - ext/ruby_prof/extconf.rb
 extra_rdoc_files: []
 files:
 - CHANGES
 - LICENSE
-- Rakefile
 - README.rdoc
-- ruby-prof.gemspec
+- Rakefile
 - bin/ruby-prof
+- bin/ruby-prof-check-trace
+- doc/LICENSE.html
+- doc/README_rdoc.html
+- doc/Rack.html
+- doc/Rack/RubyProf.html
+- doc/RubyProf.html
+- doc/RubyProf/AbstractPrinter.html
+- doc/RubyProf/AggregateCallInfo.html
+- doc/RubyProf/CallInfo.html
+- doc/RubyProf/CallInfoPrinter.html
+- doc/RubyProf/CallInfoVisitor.html
+- doc/RubyProf/CallStackPrinter.html
+- doc/RubyProf/CallTreePrinter.html
+- doc/RubyProf/Cmd.html
+- doc/RubyProf/DotPrinter.html
+- doc/RubyProf/FlatPrinter.html
+- doc/RubyProf/FlatPrinterWithLineNumbers.html
+- doc/RubyProf/GraphHtmlPrinter.html
+- doc/RubyProf/GraphPrinter.html
+- doc/RubyProf/MethodInfo.html
+- doc/RubyProf/MultiPrinter.html
+- doc/RubyProf/Profile.html
+- doc/RubyProf/ProfileTask.html
+- doc/RubyProf/Test.html
+- doc/RubyProf/Thread.html
 - doc/created.rid
 - doc/examples/flat_txt.html
+- doc/examples/graph_html.html
 - doc/examples/graph_txt.html
+- doc/fonts.css
+- doc/fonts/Lato-Light.ttf
+- doc/fonts/Lato-LightItalic.ttf
+- doc/fonts/Lato-Regular.ttf
+- doc/fonts/Lato-RegularItalic.ttf
+- doc/fonts/SourceCodePro-Bold.ttf
+- doc/fonts/SourceCodePro-Regular.ttf
 - doc/images/add.png
+- doc/images/arrow_up.png
 - doc/images/brick.png
 - doc/images/brick_link.png
 - doc/images/bug.png
@@ -106,31 +140,7 @@ files:
 - doc/js/search.js
 - doc/js/search_index.js
 - doc/js/searcher.js
-- doc/LICENSE.html
-- doc/Rack/RubyProf.html
-- doc/Rack.html
 - doc/rdoc.css
-- doc/README_rdoc.html
-- doc/RubyProf/AbstractPrinter.html
-- doc/RubyProf/AggregateCallInfo.html
-- doc/RubyProf/CallInfo.html
-- doc/RubyProf/CallInfoPrinter.html
-- doc/RubyProf/CallInfoVisitor.html
-- doc/RubyProf/CallStackPrinter.html
-- doc/RubyProf/CallTreePrinter.html
-- doc/RubyProf/Cmd.html
-- doc/RubyProf/DotPrinter.html
-- doc/RubyProf/FlatPrinter.html
-- doc/RubyProf/FlatPrinterWithLineNumbers.html
-- doc/RubyProf/GraphHtmlPrinter.html
-- doc/RubyProf/GraphPrinter.html
-- doc/RubyProf/MethodInfo.html
-- doc/RubyProf/MultiPrinter.html
-- doc/RubyProf/Profile.html
-- doc/RubyProf/ProfileTask.html
-- doc/RubyProf/Test.html
-- doc/RubyProf/Thread.html
-- doc/RubyProf.html
 - doc/table_of_contents.html
 - examples/empty.png
 - examples/flat.txt
@@ -147,7 +157,9 @@ files:
 - examples/stack.html
 - ext/ruby_prof/extconf.rb
 - ext/ruby_prof/rp_call_info.c
+- ext/ruby_prof/rp_call_info.h
 - ext/ruby_prof/rp_measure.c
+- ext/ruby_prof/rp_measure.h
 - ext/ruby_prof/rp_measure_allocations.c
 - ext/ruby_prof/rp_measure_cpu_time.c
 - ext/ruby_prof/rp_measure_gc_runs.c
@@ -156,35 +168,26 @@ files:
 - ext/ruby_prof/rp_measure_process_time.c
 - ext/ruby_prof/rp_measure_wall_time.c
 - ext/ruby_prof/rp_method.c
-- ext/ruby_prof/rp_stack.c
-- ext/ruby_prof/rp_thread.c
-- ext/ruby_prof/ruby_prof.c
-- ext/ruby_prof/rp_call_info.h
-- ext/ruby_prof/rp_measure.h
 - ext/ruby_prof/rp_method.h
+- ext/ruby_prof/rp_stack.c
 - ext/ruby_prof/rp_stack.h
+- ext/ruby_prof/rp_thread.c
 - ext/ruby_prof/rp_thread.h
+- ext/ruby_prof/ruby_prof.c
 - ext/ruby_prof/ruby_prof.h
-- ext/ruby_prof/version.h
 - ext/ruby_prof/vc/ruby_prof.sln
 - ext/ruby_prof/vc/ruby_prof_18.vcxproj
 - ext/ruby_prof/vc/ruby_prof_19.vcxproj
 - ext/ruby_prof/vc/ruby_prof_20.vcxproj
 - lib/ruby-prof.rb
-- lib/unprof.rb
 - lib/ruby-prof/aggregate_call_info.rb
 - lib/ruby-prof/call_info.rb
 - lib/ruby-prof/call_info_visitor.rb
 - lib/ruby-prof/compatibility.rb
-- lib/ruby-prof/method_info.rb
-- lib/ruby-prof/profile.rb
-- lib/ruby-prof/rack.rb
-- lib/ruby-prof/task.rb
-- lib/ruby-prof/test.rb
-- lib/ruby-prof/thread.rb
 - lib/ruby-prof/images/empty.png
 - lib/ruby-prof/images/minus.png
 - lib/ruby-prof/images/plus.png
+- lib/ruby-prof/method_info.rb
 - lib/ruby-prof/printers/abstract_printer.rb
 - lib/ruby-prof/printers/call_info_printer.rb
 - lib/ruby-prof/printers/call_stack_printer.rb
@@ -195,6 +198,13 @@ files:
 - lib/ruby-prof/printers/graph_html_printer.rb
 - lib/ruby-prof/printers/graph_printer.rb
 - lib/ruby-prof/printers/multi_printer.rb
+- lib/ruby-prof/profile.rb
+- lib/ruby-prof/rack.rb
+- lib/ruby-prof/task.rb
+- lib/ruby-prof/thread.rb
+- lib/ruby-prof/version.rb
+- lib/unprof.rb
+- ruby-prof.gemspec
 - test/aggregate_test.rb
 - test/basic_test.rb
 - test/call_info_test.rb
@@ -204,7 +214,6 @@ files:
 - test/enumerable_test.rb
 - test/exceptions_test.rb
 - test/exclude_threads_test.rb
-- test/exec_test.rb
 - test/fiber_test.rb
 - test/line_number_test.rb
 - test/measure_allocations_test.rb
@@ -227,10 +236,10 @@ files:
 - test/stack_test.rb
 - test/start_stop_test.rb
 - test/test_helper.rb
-- test/test_suite.rb
 - test/thread_test.rb
 - test/unique_call_path_test.rb
-homepage: https://github.com/rdp/ruby-prof
+- test/yarv_test.rb
+homepage: https://github.com/ruby-prof/ruby-prof
 licenses: []
 metadata: {}
 post_install_message: 
@@ -239,20 +248,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Fast Ruby profiler
 test_files:
 - test/test_helper.rb
-- test/test_suite.rb