ruby-prof 0.11.0.rc1 → 0.11.0.rc2

data/test/stack_test.rb

@@ -46,7 +46,7 @@ class StackTest < Test::Unit::TestCase
     #   StackClass#c
     #   StackClass#b
 
-    methods = result.threads.values.first.sort.reverse
+    methods = result.threads.first.methods.sort.reverse
     assert_equal(5, methods.length)
 
     # Check StackTest#test_call_sequence

data/test/start_stop_test.rb

@@ -53,7 +53,7 @@ class StartStopTest < Test::Unit::TestCase
     #   StartStopTest#method3
     #   Kernel#sleep
 
-    methods = @result.threads.values.first.sort.reverse
+    methods = @result.threads.first.methods.sort.reverse
     assert_equal(4, methods.length)
 
     # Check StackTest#test_call_sequence
@@ -61,8 +61,8 @@ class StartStopTest < Test::Unit::TestCase
     assert_equal('StartStopTest#method1', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(2, method.total_time, 0.05)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
+    assert_in_delta(0, method.wait_time, 0.02)
+    assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(2, method.children_time, 0.05)
     assert_equal(1, method.call_infos.length)
 
@@ -74,8 +74,8 @@ class StartStopTest < Test::Unit::TestCase
     assert_equal('StartStopTest#method2', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(2, method.total_time, 0.05)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
+    assert_in_delta(0, method.wait_time, 0.02)
+    assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(2, method.children_time, 0.05)
     assert_equal(1, method.call_infos.length)
 
@@ -86,10 +86,10 @@ class StartStopTest < Test::Unit::TestCase
     method = methods[2]
     assert_equal('StartStopTest#method3', method.full_name)
     assert_equal(1, method.called)
-    assert_in_delta(2, method.total_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(2, method.children_time, 0.01)
+    assert_in_delta(2, method.total_time, 0.02)
+    assert_in_delta(0, method.wait_time, 0.02)
+    assert_in_delta(0, method.self_time, 0.02)
+    assert_in_delta(2, method.children_time, 0.02)
     assert_equal(1, method.call_infos.length)
 
     call_info = method.call_infos[0]
@@ -99,10 +99,10 @@ class StartStopTest < Test::Unit::TestCase
     method = methods[3]
     assert_equal('Kernel#sleep', method.full_name)
     assert_equal(1, method.called)
-    assert_in_delta(2, method.total_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(2, method.self_time, 0.01)
-    assert_in_delta(0, method.children_time, 0.01)
+    assert_in_delta(2, method.total_time, 0.02)
+    assert_in_delta(0, method.wait_time, 0.02)
+    assert_in_delta(2, method.self_time, 0.02)
+    assert_in_delta(0, method.children_time, 0.02)
     assert_equal(1, method.call_infos.length)
 
     call_info = method.call_infos[0]

data/test/summarize_test.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+def slow
+  sleep(3)
+end
+
+def fast
+  sleep(3)
+end
+
+def slow_caller
+  1.times do
+    slow
+  end
+end
+
+def fast_caller
+  1.times do
+    fast
+  end
+end
+
+def parent
+  [1..10].each do
+  #slow_caller
+  fast_caller
+    end
+end
+
+class SummarizeTest < 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
+    result = RubyProf::Profile.profile do
+      parent
+    end
+
+    printer = RubyProf::GraphPrinter.new(result)
+    printer.print(STDOUT)
+
+  end
+end

data/test/test_suite.rb

@@ -4,6 +4,7 @@ require File.expand_path("../test_helper", __FILE__)
 
 %w(aggregate_test
    basic_test
+   call_info_visitor_test
    duplicate_names_test
    dynamic_method_test
    enumerable_test

data/test/thread_test.rb

@@ -20,7 +20,7 @@ class ThreadTest < Test::Unit::TestCase
 
     thread.join
     result = RubyProf.stop
-    assert_equal(2, result.threads.keys.length) # this should pass...
+    assert_equal(2, result.threads.length)
   end
 
   def test_thread_identity
@@ -31,9 +31,9 @@ class ThreadTest < Test::Unit::TestCase
     thread.join
     result = RubyProf.stop
 
-    thread_ids = result.threads.keys.sort
+    thread_ids = result.threads.map {|thread| thread.id}.sort
     threads = [Thread.current, thread]
-    assert_equal(2, thread_ids.length) # should pass
+    assert_equal(2, result.threads.length)
 
     assert(thread_ids.include?(threads[0].object_id))
     assert(thread_ids.include?(threads[1].object_id))
@@ -59,7 +59,9 @@ class ThreadTest < Test::Unit::TestCase
 
     # Check background thread
     assert_equal(2, result.threads.length)
-    methods = result.threads[thread.object_id].sort.reverse
+
+    rp_thread = result.threads.detect {|athread| athread.id == thread.object_id}
+    methods = rp_thread.methods.sort.reverse
     assert_equal(2, methods.length)
 
     method = methods[0]
@@ -88,7 +90,8 @@ class ThreadTest < Test::Unit::TestCase
     assert_equal(0, call_info.children.length)
 
     # Check foreground thread
-    methods = result.threads[Thread.current.object_id].sort.reverse
+    rp_thread = result.threads.detect {|athread| athread.id == Thread.current.object_id}
+    methods = rp_thread.methods.sort.reverse
     assert_equal(4, methods.length)
     methods = methods.sort.reverse
 
@@ -150,13 +153,14 @@ class ThreadTest < Test::Unit::TestCase
 
   # useless test
   def test_thread_back_and_forth
-        result = RubyProf.profile do
-                a = Thread.new { 100_000.times { sleep 0 }}
-                b = Thread.new { 100_000.times { sleep 0 }}
-                a.join
-                b.join
-        end
-        assert result.threads.values.flatten.sort[-1].total_time < 10 # 10s. Amazingly, this can fail in OS X at times. Amazing.
+      result = RubyProf.profile do
+              a = Thread.new { 100_000.times { sleep 0 }}
+              b = Thread.new { 100_000.times { sleep 0 }}
+              a.join
+              b.join
+      end
+      methods = result.threads.map {|thread| thread.methods}
+      assert(methods.flatten.sort[-1].total_time < 10) # 10s. Amazingly, this can fail in OS X at times. Amazing.
   end
 
   def test_thread

data/test/unique_call_path_test.rb

@@ -36,8 +36,8 @@ class UniqueCallPathTest < Test::Unit::TestCase
     end
 
     root_methods = Array.new
-    result.threads.each do | thread_id, methods |
-      methods.each do | m |
+    result.threads.each do |thread|
+      thread.methods.each do | m |
         if m.root?
           root_methods.push(m)
         end
@@ -57,8 +57,8 @@ class UniqueCallPathTest < Test::Unit::TestCase
     end
 
     root_methods = Array.new
-    result.threads.each do | thread_id, methods |
-      methods.each do | m |
+    result.threads.each do |thread|
+      thread.methods.each do | m |
         if m.root?
           root_methods.push(m)
         end
@@ -92,8 +92,8 @@ class UniqueCallPathTest < Test::Unit::TestCase
     end
 
     root_methods = Array.new
-    result.threads.each do | thread_id, methods |
-      methods.each do | m |
+    result.threads.each do |thread|
+      thread.methods.each do | m |
         if m.root?
           root_methods.push(m)
         end
@@ -150,8 +150,8 @@ class UniqueCallPathTest < Test::Unit::TestCase
     end
 
     root_methods = Array.new
-    result.threads.each do | thread_id, methods |
-      methods.each do | m |
+    result.threads.each do |thread|
+      thread.methods.each do | m |
         if m.root?
           root_methods.push(m)
         end
@@ -173,8 +173,8 @@ class UniqueCallPathTest < Test::Unit::TestCase
     end
 
     root_methods = Array.new
-    result.threads.each do | thread_id, methods |
-      methods.each do | m |
+    result.threads.each do |thread|
+      thread.methods.each do | m |
         if m.root?
           root_methods.push(m)
         end

metadata

@@ -1,58 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-prof
-version: !ruby/object:Gem::Version 
-  hash: 15424167
+version: !ruby/object:Gem::Version
+  version: 0.11.0.rc2
   prerelease: 7
-  segments: 
-  - 0
-  - 11
-  - 0
-  - rc
-  - 1
-  version: 0.11.0.rc1
 platform: ruby
-authors: 
+authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: |
-  ruby-prof is a fast code profiler for Ruby. It is a C extension and
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'ruby-prof is a fast code profiler for Ruby. It is a C extension and
+
   therefore is many times faster than the standard Ruby profiler. It
+
   supports both flat and graph profiles.  For each method, graph profiles
+
   show how long the method ran, which methods called it and which
+
   methods it called. RubyProf generate both text and html and can output
+
   it to standard out or to a file.
 
+'
 email: shugo@ruby-lang.org, cfis@savagexi.com, rogerdpack@gmail.com, skaes@railsexpress.de
-executables: 
+executables:
 - ruby-prof
-extensions: 
+extensions:
 - ext/ruby_prof/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
+- CHANGES
+- LICENSE
 - Rakefile
 - README.rdoc
-- LICENSE
-- CHANGES
+- ruby-prof.gemspec
 - bin/ruby-prof
 - examples/empty.png
 - examples/flat.txt
@@ -67,6 +66,7 @@ files:
 - examples/multi.stack.html
 - examples/plus.png
 - examples/stack.html
+- ext/ruby_prof/extconf.rb
 - ext/ruby_prof/rp_call_info.c
 - ext/ruby_prof/rp_measure.c
 - ext/ruby_prof/rp_measure_allocations.c
@@ -87,50 +87,42 @@ files:
 - ext/ruby_prof/rp_thread.h
 - ext/ruby_prof/ruby_prof.h
 - ext/ruby_prof/version.h
-- lib/1.8/ruby_prof.so
-- lib/1.9/ruby_prof.exp
-- lib/1.9/ruby_prof.ilk
-- lib/1.9/ruby_prof.lib
-- lib/1.9/ruby_prof.pdb
-- lib/1.9/ruby_prof.so
-- lib/ruby-prof/abstract_printer.rb
+- ext/ruby_prof/vc/ruby_prof.sln
+- ext/ruby_prof/vc/ruby_prof.vcxproj
+- ext/ruby_prof/vc/ruby_prof_18.vcxproj
 - lib/ruby-prof/aggregate_call_info.rb
 - lib/ruby-prof/call_info.rb
-- lib/ruby-prof/call_stack_printer.rb
-- lib/ruby-prof/call_tree_printer.rb
+- lib/ruby-prof/call_info_visitor.rb
 - lib/ruby-prof/compatibility.rb
-- lib/ruby-prof/dot_printer.rb
-- lib/ruby-prof/empty.png
-- lib/ruby-prof/flat_printer.rb
-- lib/ruby-prof/flat_printer_with_line_numbers.rb
-- lib/ruby-prof/graph_html_printer.rb
-- lib/ruby-prof/graph_printer.rb
 - lib/ruby-prof/method_info.rb
-- lib/ruby-prof/minus.png
-- lib/ruby-prof/multi_printer.rb
-- lib/ruby-prof/plus.png
 - lib/ruby-prof/profile.rb
 - lib/ruby-prof/rack.rb
-- lib/ruby-prof/symbol_to_proc.rb
 - lib/ruby-prof/task.rb
 - lib/ruby-prof/test.rb
-- lib/ruby-prof.rb
-- lib/ruby_prof.exp
-- lib/ruby_prof.ilk
-- lib/ruby_prof.lib
-- lib/ruby_prof.pdb
-- lib/ruby_prof.so
-- lib/unprof.rb
+- lib/ruby-prof/images/empty.png
+- lib/ruby-prof/images/minus.png
+- lib/ruby-prof/images/plus.png
+- lib/ruby-prof/printers/abstract_printer.rb
+- lib/ruby-prof/printers/call_info_printer.rb
+- lib/ruby-prof/printers/call_stack_printer.rb
+- lib/ruby-prof/printers/call_tree_printer.rb
+- lib/ruby-prof/printers/dot_printer.rb
+- lib/ruby-prof/printers/flat_printer.rb
+- lib/ruby-prof/printers/flat_printer_with_line_numbers.rb
+- lib/ruby-prof/printers/graph_html_printer.rb
+- lib/ruby-prof/printers/graph_printer.rb
+- lib/ruby-prof/printers/multi_printer.rb
 - test/aggregate_test.rb
 - test/basic_test.rb
 - test/bug_test.rb
-- test/do_nothing.rb
+- test/call_info_visitor_test.rb
 - test/duplicate_names_test.rb
 - test/dynamic_method_test.rb
 - test/enumerable_test.rb
 - test/exceptions_test.rb
 - test/exclude_threads_test.rb
 - test/exec_test.rb
+- test/gc_test.rb
 - test/line_number_test.rb
 - test/measure_allocations_test.rb
 - test/measure_cpu_time_test.rb
@@ -151,48 +143,35 @@ files:
 - test/stack_printer_test.rb
 - test/stack_test.rb
 - test/start_stop_test.rb
+- test/summarize_test.rb
 - test/test_helper.rb
 - test/test_suite.rb
 - test/thread_test.rb
 - test/unique_call_path_test.rb
-- ext/ruby_prof/extconf.rb
 homepage: https://github.com/rdp/ruby-prof
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Fast Ruby profiler
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/test_suite.rb