ruby-prof 0.8.2 → 0.9.0

data/test/singleton_test.rb

@@ -32,6 +32,7 @@ class SingletonTest < Test::Unit::TestCase
       assert_equal(1, a.as.size)
     end
     printer = RubyProf::FlatPrinter.new(result)
-    printer.print(STDOUT)
+    output = ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT'] == "1" ? STDOUT : ''
+    printer.print(output)
   end
-end
+end

data/test/stack_printer_test.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'ruby-prof'
+require 'tmpdir'
+
+# Test data
+#     A
+#    / \
+#   B   C
+#        \
+#         B
+
+class STPT
+  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 StackPrinterTest < 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_stack_can_be_printed
+    start_time = Time.now
+    RubyProf.start
+    5.times{STPT.new.a}
+    result = RubyProf.stop
+    end_time = Time.now
+    expected_time = end_time - start_time
+
+    file_contents = nil
+    assert_nothing_raised { file_contents = print(result) }
+    assert file_contents =~ /Thread: (\d+) \(100\.00% ~ ([.0-9]+)\)/
+    actual_time = $2.to_f
+    difference = (expected_time-actual_time).abs
+    assert difference<0.001 # less than 1 ms
+  end
+
+  def test_method_elimination
+    RubyProf.start
+    5.times{STPT.new.a}
+    result = RubyProf.stop
+    assert_nothing_raised {
+      # result.dump
+      result.eliminate_methods!([/Integer#times/])
+      # $stderr.puts "================================"
+      # result.dump
+      print(result)
+    }
+  end
+
+  private
+  def print(result)
+    test = caller.first =~ /in `(.*)'/ ? $1 : "test"
+    testfile_name = "#{Dir::tmpdir}/ruby_prof_#{test}.html"
+    printer = RubyProf::CallStackPrinter.new(result)
+    File.open(testfile_name, "w") {|f| printer.print(f, :threshold => 0, :min_percent => 0, :title => "ruby_prof #{test}")}
+    system("open '#{testfile_name}'") if RUBY_PLATFORM =~ /darwin/ && ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT']=="1"
+    File.open(testfile_name, "r"){|f| f.read}
+  end
+end

data/test/stack_test.rb

@@ -76,7 +76,7 @@ class StackTest < Test::Unit::TestCase
     call_info = method.call_infos[0]
     assert_equal('StackTest#test_call_sequence->StackClass#a', call_info.call_sequence)
     assert_equal(3, call_info.children.length)
-    
+
     # Check Kernel#sleep
     method = methods[2]
     assert_equal('Kernel#sleep', method.full_name)

data/test/start_stop_test.rb

@@ -2,7 +2,7 @@
 
 require 'test/unit'
 require 'ruby-prof'
- 
+
 class StartStopTest < Test::Unit::TestCase
   def setup
     # Need to use wall time for this test due to the sleep calls
@@ -92,4 +92,4 @@ class StartStopTest < Test::Unit::TestCase
     assert_equal('StartStopTest#method1->StartStopTest#method2->StartStopTest#method3->Kernel#sleep', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
   end
-end
+end

data/test/test_suite.rb

@@ -1,3 +1,9 @@
+begin
+  require 'rubygems'
+  require 'redgreen'
+rescue LoadError
+end
+
 require 'test/unit'
 
 require 'aggregate_test'
@@ -16,6 +22,9 @@ require 'stack_test'
 require 'start_stop_test'
 require 'thread_test'
 require 'unique_call_path_test'
+require 'stack_printer_test'
+require 'multi_printer_test'
+require 'method_elimination_test'
 
 # Can't use this one here cause it breaks
 # the rest of the unit tets (Ruby Prof gets

data/test/thread_test.rb

@@ -21,11 +21,11 @@ class ThreadTest < Test::Unit::TestCase
     result = RubyProf.stop
     assert_equal(2, result.threads.keys.length) # this should pass...
   end
-  
+
   def test_thread_identity
     RubyProf.start
     thread = Thread.new do
-      sleep(1)    
+      sleep(1)
     end
     thread.join
     result = RubyProf.stop
@@ -36,16 +36,16 @@ class ThreadTest < Test::Unit::TestCase
 
     assert(thread_ids.include?(threads[0].object_id))
     assert(thread_ids.include?(threads[1].object_id))
-    
+
     assert_instance_of(Thread, ObjectSpace._id2ref(thread_ids[0]))
     assert(threads.include?(ObjectSpace._id2ref(thread_ids[0])))
-    
+
     assert_instance_of(Thread, ObjectSpace._id2ref(thread_ids[1]))
     assert(threads.include?(ObjectSpace._id2ref(thread_ids[1])))
   end
 
   def test_thread_timings
-  	RubyProf.start    
+        RubyProf.start
     thread = Thread.new do
       sleep 0 # force it to hit thread.join, below, first
       # thus forcing sleep(1), below, to be counted as (wall) self_time
@@ -55,7 +55,7 @@ class ThreadTest < Test::Unit::TestCase
     end
     thread.join
     result = RubyProf.stop
-    
+
     # Check background thread
     assert_equal(2, result.threads.length)
     methods = result.threads[thread.object_id].sort.reverse
@@ -96,7 +96,7 @@ class ThreadTest < Test::Unit::TestCase
     # the sub calls to Object#new, when popped,
     # cause the parent frame to be created for method #test_thread_timings, which means a +1 when it's popped in the end
     # xxxx a test that shows it the other way, too (never creates parent frame--if that's even possible)
-    assert_equal(1, method.called) 
+    assert_equal(1, method.called)
     assert_in_delta(1, method.total_time, 0.01)
     assert_in_delta(0, method.self_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.05)
@@ -111,7 +111,7 @@ class ThreadTest < Test::Unit::TestCase
     assert_equal('Thread#join', 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.self_time, 0.01)
     assert_in_delta(1.0, method.wait_time, 0.01)
     assert_in_delta(0, method.children_time, 0.01)
 
@@ -146,18 +146,18 @@ class ThreadTest < Test::Unit::TestCase
     assert_equal('ThreadTest#test_thread_timings-><Class::Thread>#new->Thread#initialize', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
   end
-  
+
   # 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  	
+        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
   end
-  
+
   def test_thread
     result = RubyProf.profile do
       begin

data/test/unique_call_path_test.rb

@@ -112,7 +112,7 @@ class UniqueCallPathTest < Test::Unit::TestCase
       end
     end
 
-    assert !call_info_a.nil? 
+    assert !call_info_a.nil?
 
     children_of_a = Array.new
 
@@ -121,7 +121,7 @@ class UniqueCallPathTest < Test::Unit::TestCase
         children_of_a.push(c)
       end
     end
-    
+
     if RUBY_VERSION < '1.9'
       assert_equal(4, call_info_a.target.children.length)
     else
@@ -139,7 +139,7 @@ class UniqueCallPathTest < Test::Unit::TestCase
       assert_equal(1, children_of_a.length)
       assert_equal("UniqueCallPath#method_b", children_of_a[0].target.full_name)
     end
-    
+
   end
 
   def test_id2ref
@@ -222,4 +222,4 @@ class UniqueCallPathTest < Test::Unit::TestCase
       assert_equal("UniqueCallPath#method_b", children_of_a[0].target.full_name)
     end
   end
-end
+end

metadata

@@ -5,17 +5,17 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
-- Shugo Maeda, Charlie Savage, Roger Pack
+- Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -06:00
+date: 2010-08-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,11 +50,11 @@ 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 
+  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
+email: shugo@ruby-lang.org, cfis@savagexi.com, rogerdpack@gmail.com, skaes@railsexpress.de
 executables: 
 - ruby-prof
 extensions: 
@@ -63,13 +63,23 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
-- README
+- README.rdoc
 - LICENSE
 - CHANGES
 - bin/ruby-prof
+- examples/empty.png
 - examples/flat.txt
+- examples/graph.dot
 - examples/graph.html
+- examples/graph.png
 - examples/graph.txt
+- examples/minus.png
+- examples/multi.flat.txt
+- examples/multi.graph.html
+- examples/multi.grind.dat
+- examples/multi.stack.html
+- examples/plus.png
+- examples/stack.html
 - ext/ruby_prof/ruby_prof.c
 - ext/ruby_prof/measure_allocations.h
 - ext/ruby_prof/measure_cpu_time.h
@@ -85,12 +95,20 @@ files:
 - lib/ruby-prof/abstract_printer.rb
 - 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/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/rack.rb
+- lib/ruby-prof/result.rb
 - lib/ruby-prof/symbol_to_proc.rb
 - lib/ruby-prof/task.rb
 - lib/ruby-prof/test.rb
@@ -111,7 +129,9 @@ files:
 - test/exec_test.rb
 - test/line_number_test.rb
 - test/measurement_test.rb
+- test/method_elimination_test.rb
 - test/module_test.rb
+- test/multi_printer_test.rb
 - test/no_method_class_test.rb
 - test/prime.rb
 - test/prime_test.rb
@@ -119,6 +139,7 @@ files:
 - test/recursive_test.rb
 - test/ruby-prof-bin
 - test/singleton_test.rb
+- test/stack_printer_test.rb
 - test/stack_test.rb
 - test/start_stop_test.rb
 - test/test_suite.rb