ruby-prof 0.8.2 → 0.9.0

data/test/module_test.rb

@@ -16,7 +16,7 @@ module Bar
     sleep(0.5)
     Foo::hello
   end
-  
+
   def hello
     sleep(0.5)
     Bar::hello
@@ -32,23 +32,23 @@ class ModuleTest < Test::Unit::TestCase
     end
 
     methods = result.threads.values.first.sort.reverse
-      
+
     # Length should be 5
     assert_equal(5, methods.length)
-    
+
     method = methods[0]
     assert_equal('ModuleTest#test_nested_modules', method.full_name)
-    
+
     method = methods[1]
     assert_equal('Bar#hello', method.full_name)
 
     method = methods[2]
     assert_equal('Kernel#sleep', method.full_name)
-    
+
     method = methods[3]
     assert_equal('<Module::Bar>#hello', method.full_name)
-    
+
     method = methods[4]
     assert_equal('<Module::Foo>#hello', method.full_name)
-  end 
+  end
 end

data/test/multi_printer_test.rb

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'ruby-prof'
+require 'tmpdir'
+
+# Test data
+#     A
+#    / \
+#   B   C
+#        \
+#         B
+
+class MSTPT
+  def a
+    100.times{b}
+    300.times{c}
+    c;c;c
+  end
+
+  def b
+    sleep 0
+  end
+
+  def c
+    5.times{b}
+  end
+end
+
+class MultiPrinterTest < 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_all_profiles_can_be_created
+    start_time = Time.now
+    RubyProf.start
+    5.times{MSTPT.new.a}
+    result = RubyProf.stop
+    end_time = Time.now
+    expected_time = end_time - start_time
+    stack = graph = nil
+    assert_nothing_raised { stack, graph = print(result) }
+    re = Regexp.new('
+\s*<table>
+\s*<tr>
+\s*<th>Thread ID</th>
+\s*<th>Total Time</th>
+\s*</tr>
+\s*
+\s*<tr>
+\s*<td><a href="#\d+">\d+</a></td>
+\s*<td>([\.0-9]+)</td>
+\s*</tr>
+\s*
+\s*</table>')
+    assert graph =~ re
+    display_time = $1.to_f
+    difference = (expected_time-display_time).abs
+    assert_in_delta expected_time, display_time, 0.001
+  end
+
+  private
+  def print(result)
+    test = caller.first =~ /in `(.*)'/ ? $1 : "test"
+    path = Dir::tmpdir
+    profile = "ruby_prof_#{test}"
+    printer = RubyProf::MultiPrinter.new(result)
+    printer.print(:path => path, :profile => profile,
+                  :threshold => 0, :min_percent => 0, :title => "ruby_prof #{test}")
+    if RUBY_PLATFORM =~ /darwin/ && ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT']=="1"
+      system("open '#{printer.stack_profile}'")
+    end
+    if GC.respond_to?(:dump_file_and_line_info)
+      GC.start
+      GC.dump_file_and_line_info("heap.dump")
+    end
+    [File.open(printer.stack_profile){|f|f.read}, File.open(printer.graph_profile){|f|f.read}]
+  end
+end

data/test/no_method_class_test.rb

@@ -2,7 +2,7 @@
 require 'ruby-prof'
 
 # Make sure this works with no class or method
-result = RubyProf.profile do 
+result = RubyProf.profile do
   sleep 1
 end
 
@@ -10,4 +10,4 @@ methods = result.threads.values.first
 global_method = methods.sort_by {|method| method.full_name}.first
 if global_method.full_name != 'Global#[No method]'
   raise(RuntimeError, "Wrong method name.  Expected: Global#[No method].  Actual: #{global_method.full_name}")
-end
+end

data/test/prime.rb

@@ -1,7 +1,7 @@
 # A silly little test program that finds prime numbers.  It
 # is intentionally badly designed to show off the use
 # of ruby-prof.
-# 
+#
 # Source from http://people.cs.uchicago.edu/~bomb154/154/maclabs/profilers-lab/
 
 def make_random_array(length, maxnum)
@@ -9,10 +9,10 @@ def make_random_array(length, maxnum)
   result.each_index do |i|
     result[i] = rand(maxnum)
   end
-    
+
   result
 end
- 
+
 def is_prime(x)
   y = 2
   y.upto(x-1) do |i|
@@ -43,16 +43,13 @@ def find_largest(primes)
   largest
 end
 
-def run_primes
-  length = 10
-  maxnum = 1000
-  
+def run_primes(length=10, maxnum=1000)
   # Create random numbers
   random_array = make_random_array(length, maxnum)
-  
+
   # Find the primes
   primes = find_primes(random_array)
-  
+
   # Find the largest primes
   # largest = find_largest(primes)
-end
+end

data/test/printers_test.rb

@@ -1,41 +1,52 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require 'ruby-prof'
-require File.dirname(__FILE__) + '/prime'
+require 'prime'
 
 # --  Tests ----
 class PrintersTest < Test::Unit::TestCase
-  
+
   def go
-    run_primes
+    run_primes(10000)
   end
-  
+
   def setup
     RubyProf::measure_mode = RubyProf::WALL_TIME # WALL_TIME so we can use sleep in our test
     @result = RubyProf.profile do
-      run_primes
+      run_primes(10000)
       go
     end
-    
+
   end
-    
+
   def test_printers
-    printer = RubyProf::FlatPrinter.new(@result)
-    printer.print(STDOUT)
-    
-    printer = RubyProf::FlatPrinterWithLineNumbers.new(@result)
-    printer.print(STDOUT)
-    
-    printer = RubyProf::GraphHtmlPrinter.new(@result)
-    printer.print
-    
-    printer = RubyProf::GraphPrinter.new(@result)
-    printer.print
-    
-    printer = RubyProf::CallTreePrinter.new(@result)
-    printer.print(STDOUT)
-    
-    # we should get here
+    assert_nothing_raised do
+      output = ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT'] == "1" ? STDOUT : StringIO.new('')
+
+      printer = RubyProf::FlatPrinter.new(@result)
+      printer.print(output)
+
+      printer = RubyProf::FlatPrinterWithLineNumbers.new(@result)
+      printer.print(output)
+
+      printer = RubyProf::GraphHtmlPrinter.new(@result)
+      printer.print(output)
+
+      printer = RubyProf::GraphPrinter.new(@result)
+      printer.print(output)
+
+      printer = RubyProf::CallTreePrinter.new(@result)
+      printer.print(output)
+      
+      printer = RubyProf::DotPrinter.new(@result)
+      File.open("examples/graph.dot", "w") {|f| printer.print(f)}
+
+      printer = RubyProf::CallStackPrinter.new(@result)
+      File.open("examples/stack.html", "w") {|f| printer.print(f, :application => "primes")}
+
+      printer = RubyProf::MultiPrinter.new(@result)
+      printer.print(:path => "examples", :profile => "multi", :application => "primes")
+    end
   end
 
   def test_flat_string
@@ -45,32 +56,32 @@ class PrintersTest < Test::Unit::TestCase
 
   def helper_test_flat_string klass
     output = ''
-    
+
     printer = klass.new(@result)
     printer.print(output)
-    
+
     assert_match(/Thread ID: -?\d+/i, output)
     assert_match(/Total: \d+\.\d+/i, output)
     assert_match(/Object#run_primes/i, output)
     output
   end
-  
+
   def test_flat_string_with_numbers
     output = helper_test_flat_string RubyProf::FlatPrinterWithLineNumbers
-    assert_match(/prime.rb/, output)    
+    assert_match(/prime.rb/, output)
     assert_no_match(/ruby_runtime:0/, output)
     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
-		  assert_equal(2, output.scan(/Object#is_prime/).length)		
+          else
+                  # 1.9
+                  assert_equal(2, output.scan(/Object#is_prime/).length)
     end
-	  assert_no_match(/\.\/test\/prime.rb/, output) # don't use relative paths
+          assert_no_match(/\.\/test\/prime.rb/, output) # don't use relative paths
   end
-    
+
   def test_graph_html_string
     output = ''
     printer = RubyProf::GraphHtmlPrinter.new(@result)
@@ -80,7 +91,7 @@ class PrintersTest < Test::Unit::TestCase
     assert_match( %r{<th>Total Time</th>}i, output )
     assert_match( /Object#run_primes/i, output )
   end
-    
+
   def test_graph_string
     output = ''
     printer = RubyProf::GraphPrinter.new(@result)
@@ -90,7 +101,7 @@ class PrintersTest < Test::Unit::TestCase
     assert_match( /Total Time: \d+\.\d+/i, output )
     assert_match( /Object#run_primes/i, output )
   end
-    
+
   def test_call_tree_string
     output = ''
     printer = RubyProf::CallTreePrinter.new(@result)
@@ -99,33 +110,32 @@ class PrintersTest < Test::Unit::TestCase
     assert_match(/events: wall_time/i, output)
     assert_no_match(/d\d\d\d\d\d/, output) # old bug looked [in error] like Object::run_primes(d5833116)
   end
-  
+
   def do_nothing
     start = Time.now
     while(Time.now == start)
     end
   end
-  
+
   def test_all_with_small_percentiles
-    
+
     result = RubyProf.profile do
       sleep 2
-      do_nothing 
+      do_nothing
     end
-    
+
     # RubyProf::CallTreePrinter doesn't "do" a min_percent
     # RubyProf::FlatPrinter only outputs if self time > percent...
     # RubyProf::FlatPrinterWithLineNumbers same
     for klass in [ RubyProf::GraphPrinter, RubyProf::GraphHtmlPrinter]
-      puts klass
       printer = klass.new(result)
       out = ''
       output = printer.print(out, :min_percent => 0.00000001 )
-      assert_match(/do_nothing/, out)      
+      assert_match(/do_nothing/, out)
     end
-    
-  end    
-  
-  
-  
+
+  end
+
+
+
 end

data/test/recursive_test.rb

@@ -34,13 +34,13 @@ class RecursiveTest < Test::Unit::TestCase
     end
 
     methods = result.threads.values.first.sort.reverse
-    
+
     if RUBY_VERSION < '1.9'
-      assert_equal(6, methods.length) # includes Fixnum+, Fixnum==...
+      assert_equal(5, methods.length) # includes Fixnum+, Fixnum==...
     else
-      assert_equal(4, methods.length)
+      assert_equal(3, methods.length) # which don't show up in 1.9
     end
-    
+
     method = methods[0]
     assert_equal('RecursiveTest#test_simple', method.full_name)
     assert_equal(1, method.called)
@@ -56,13 +56,13 @@ class RecursiveTest < Test::Unit::TestCase
 
     method = methods[1]
     assert_equal('Object#simple', method.full_name)
-    assert_equal(1, method.called)
+    assert_equal(2, method.called)
     assert_in_delta(2, method.total_time, 0.02)
     assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(0, method.wait_time, 0.02)
     assert_in_delta(2, method.children_time, 0.02)
 
-    assert_equal(1, method.call_infos.length)
+    assert_equal(2, method.call_infos.length)
     call_info = method.call_infos[0]
     assert_equal('RecursiveTest#test_simple->Object#simple', call_info.call_sequence)
     if RUBY_VERSION < '1.9'
@@ -70,6 +70,7 @@ class RecursiveTest < Test::Unit::TestCase
     else
       assert_equal(2, call_info.children.length)
     end
+
     method = methods[2]
     assert_equal('Kernel#sleep', method.full_name)
     assert_equal(2, method.called)
@@ -84,24 +85,11 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal(0, call_info.children.length)
 
     call_info = method.call_infos[1]
-    assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple(d1)->Kernel#sleep', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple->Kernel#sleep', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
 
-    method = methods[3]
-    assert_equal('Object#simple(d1)', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(1, method.total_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(1, method.children_time, 0.01)
-
-    assert_equal(1, method.call_infos.length)
-    call_info = method.call_infos[0]
-    assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple(d1)', call_info.call_sequence)
     if RUBY_VERSION < '1.9'
-      assert_equal(3, call_info.children.length)
-
-      method = methods[4]
+      method = methods[3]
       assert_equal('Fixnum#-', method.full_name)
       assert_equal(2, method.called)
       assert_in_delta(0, method.total_time, 0.01)
@@ -115,10 +103,10 @@ class RecursiveTest < Test::Unit::TestCase
       assert_equal(0, call_info.children.length)
 
       call_info = method.call_infos[1]
-      assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple(d1)->Fixnum#-', call_info.call_sequence)
+      assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple->Fixnum#-', call_info.call_sequence)
       assert_equal(0, call_info.children.length)
 
-      method = methods[5]
+      method = methods[4]
       assert_equal('Fixnum#==', method.full_name)
       assert_equal(2, method.called)
       assert_in_delta(0, method.total_time, 0.01)
@@ -132,11 +120,8 @@ class RecursiveTest < Test::Unit::TestCase
       assert_equal(0, call_info.children.length)
 
       call_info = method.call_infos[1]
-      assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple(d1)->Fixnum#==', call_info.call_sequence)
+      assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple->Fixnum#==', call_info.call_sequence)
       assert_equal(0, call_info.children.length)
-
-    else
-      assert_equal(1, call_info.children.length)
     end
   end
 
@@ -147,9 +132,9 @@ class RecursiveTest < Test::Unit::TestCase
 
     methods = result.threads.values.first.sort.reverse
     if RUBY_VERSION < '1.9'
-      assert_equal(8, methods.length) # includes Fixnum+ and Fixnum==, which aren't included in 1.9
+      assert_equal(6, methods.length) # includes Fixnum+ and Fixnum==, which aren't included in 1.9
     else
-      assert_equal(6, methods.length)
+      assert_equal(4, methods.length) # which don't show up in 1.9
     end
     method = methods[0]
     assert_equal('RecursiveTest#test_cycle', method.full_name)
@@ -166,26 +151,26 @@ class RecursiveTest < Test::Unit::TestCase
 
     method = methods[1]
     assert_equal('Object#cycle', method.full_name)
-    assert_equal(1, method.called)
+    assert_equal(2, method.called)
     assert_in_delta(2, method.total_time, 0.05)
     assert_in_delta(0, method.self_time, 0.01)
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(2, method.children_time, 0.05)
 
-    assert_equal(1, method.call_infos.length)
+    assert_equal(2, method.call_infos.length)
     call_info = method.call_infos[0]
     assert_equal('RecursiveTest#test_cycle->Object#cycle', call_info.call_sequence)
     assert_equal(1, call_info.children.length)
 
     method = methods[2]
     assert_equal('Object#sub_cycle', method.full_name)
-    assert_equal(1, method.called)
+    assert_equal(2, method.called)
     assert_in_delta(2, method.total_time, 0.05)
     assert_in_delta(0, method.self_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(2, method.children_time, 0.05)
 
-    assert_equal(1, method.call_infos.length)
+    assert_equal(2, method.call_infos.length)
     call_info = method.call_infos[0]
     assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle', call_info.call_sequence)
     if RUBY_VERSION < '1.9'
@@ -208,33 +193,11 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal(0, call_info.children.length)
 
     call_info = method.call_infos[1]
-    assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle->Object#cycle(d1)->Object#sub_cycle(d1)->Kernel#sleep', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle->Object#cycle->Object#sub_cycle->Kernel#sleep', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
 
-    method = methods[4]
-    assert_equal('Object#cycle(d1)', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(1, method.total_time, 0.05)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(1, method.children_time, 0.05)
-
-    assert_equal(1, method.call_infos.length)
-    call_info = method.call_infos[0]
-    assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle->Object#cycle(d1)', call_info.call_sequence)
-    assert_equal(1, call_info.children.length)
-
-    method = methods[5]
-    assert_equal('Object#sub_cycle(d1)', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(1, method.total_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    call_info = method.call_infos[0]
-    assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle->Object#cycle(d1)->Object#sub_cycle(d1)', call_info.call_sequence)
     if RUBY_VERSION < '1.9'
-      assert_equal(3, call_info.children.length)
-      method = methods[6]
+      method = methods[4]
       assert_equal('Fixnum#-', method.full_name)
       assert_equal(2, method.called)
       assert_in_delta(0, method.total_time, 0.01)
@@ -248,10 +211,10 @@ class RecursiveTest < Test::Unit::TestCase
       assert_equal(0, call_info.children.length)
 
       call_info = method.call_infos[1]
-      assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle->Object#cycle(d1)->Object#sub_cycle(d1)->Fixnum#-', call_info.call_sequence)
+      assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle->Object#cycle->Object#sub_cycle->Fixnum#-', call_info.call_sequence)
       assert_equal(0, call_info.children.length)
 
-      method = methods[7]
+      method = methods[5]
       assert_equal('Fixnum#==', method.full_name)
       assert_equal(2, method.called)
       assert_in_delta(0, method.total_time, 0.01)
@@ -265,10 +228,8 @@ class RecursiveTest < Test::Unit::TestCase
       assert_equal(0, call_info.children.length)
 
       call_info = method.call_infos[1]
-      assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle->Object#cycle(d1)->Object#sub_cycle(d1)->Fixnum#==', call_info.call_sequence)
+      assert_equal('RecursiveTest#test_cycle->Object#cycle->Object#sub_cycle->Object#cycle->Object#sub_cycle->Fixnum#==', call_info.call_sequence)
       assert_equal(0, call_info.children.length)
-    else
-      assert_equal(1, call_info.children.length)
     end
 
   end