ruby-prof 0.5.2 → 0.6.0

data/lib/ruby-prof.rb

@@ -32,6 +32,8 @@ module RubyProf
       RubyProf.measure_mode = RubyProf::CPU_TIME
     when "allocations"
       RubyProf.measure_mode = RubyProf::ALLOCATIONS
+    when "memory"
+      RubyProf.measure_mode = RubyProf::MEMORY
     else
       RubyProf.measure_mode = RubyProf::PROCESS_TIME
     end

data/lib/ruby-prof/call_tree_printer.rb

@@ -13,13 +13,20 @@ module RubyProf
       @output << "events: "
       case RubyProf.measure_mode
         when RubyProf::PROCESS_TIME
+          @value_scale = RubyProf::CLOCKS_PER_SEC;
           @output << 'process_time'
         when RubyProf::WALL_TIME
+          @value_scale = 1_000_000
           @output << 'wall_time'
-        when RubyProf::CPU_TIME
+        when RubyProf.const_defined?(:CPU_TIME) && RubyProf::CPU_TIME
+          @value_scale = RubyProf.cpu_frequency
           @output << 'cpu_time'
-        when RubyProf::ALLOCATIONS
+        when RubyProf.const_defined?(:ALLOCATIONS) && RubyProf::ALLOCATIONS
+          @value_scale = 1
           @output << 'allocations'
+        when RubyProf.const_defined?(:MEMORY) && RubyProf::MEMORY
+          @value_scale = 1
+          @output << 'memory'
       end
       @output << "\n\n"  
 
@@ -28,12 +35,12 @@ module RubyProf
 
     def print_threads
       @result.threads.each do |thread_id, methods|
-        print_methods(thread_id ,methods)
+        print_methods(thread_id, methods)
       end
     end
 
     def convert(value)
-      (value * 1000).round
+      (value * @value_scale).round
     end
 
     def file(method)

data/lib/ruby-prof/call_tree_printer.rb.rej

@@ -0,0 +1,27 @@
+***************
+*** 28,39 ****
+  
+      def print_threads
+        @result.threads.each do |thread_id, methods|
+-        print_methods(thread_id ,methods)
+        end
+      end
+  
+      def convert(value)
+-       (value * 1000).round
+      end
+  
+      def file(method)
+--- 32,43 ----
+  
+      def print_threads
+        @result.threads.each do |thread_id, methods|
++ 	print_methods(thread_id ,methods)
+        end
+      end
+  
+      def convert(value)
++       (value * @value_scale).round
+      end
+  
+      def file(method)

data/lib/ruby-prof/flat_printer.rb

@@ -49,8 +49,8 @@ module RubyProf
         m1.self_time <=> m2.self_time
       end.reverse
       
-      @output << "Thread ID: " << thread_id << "\n"
-      @output << "Total: " << total_time << "\n"
+      @output << "Thread ID: %d\n" % thread_id
+      @output << "Total: %0.6f\n" % total_time
       @output << "\n"
       @output << " %self     total     self     wait    child    calls  name\n"
 
@@ -63,14 +63,15 @@ module RubyProf
         #self_time_called = method.called > 0 ? method.self_time/method.called : 0
         #total_time_called = method.called > 0? method.total_time/method.called : 0
         
-        @output.printf("%6.2f  %8.2f %8.2f %8.2f %8.2f %8d  %s\n",
+        @output << "%6.2f  %8.2f %8.2f %8.2f %8.2f %8d  %s\n" % [
                       method.self_time / total_time * 100, # %self
                       method.total_time,                   # total
                       method.self_time,                    # self
                       method.wait_time,                    # wait
                       method.children_time,                # children
                       method.called,                       # calls
-                      method_name(method))                 # name
+                    method_name(method)                  # name
+                  ]
       end
     end
   end

data/lib/ruby-prof/graph_html_printer.rb

@@ -9,8 +9,8 @@ module RubyProf
   #     [code to profile]
   #   end
   #
-  #   printer = RubyProf::GraphHtmlPrinter.new(result, 5)
-  #   printer.print(STDOUT, 0)
+  #   printer = RubyProf::GraphHtmlPrinter.new(result)
+  #   printer.print(STDOUT, :min_percent=>0)
   #
   # The constructor takes two arguments.  The first is
   # a RubyProf::Result object generated from a profiling
@@ -47,8 +47,11 @@ module RubyProf
       @output = output
       setup_options(options)
       
+      filename = options[:filename]
+      template = filename ? File.read(filename).untaint : (options[:template] || self.template)
       _erbout = @output
       erb = ERB.new(template, nil, nil)
+      erb.filename = filename
       @output << erb.result(binding)
     end
 
@@ -146,6 +149,11 @@ module RubyProf
       border-left: 1px solid #CCC;
       text-align: center;
     } 
+
+    .method_name {
+      text-align: left;
+      max-width: 25em;
+    }
   </style>
   </head>
   <body>
@@ -178,17 +186,20 @@ module RubyProf
           <th><%= sprintf("%#{TIME_WIDTH}s", "Wait") %></th>
           <th><%= sprintf("%#{TIME_WIDTH+2}s", "Child") %></th>
           <th><%= sprintf("%#{CALL_WIDTH}s", "Calls") %></th>
-          <th>Name</th>
+          <th class="method_name">Name</th>
           <th>Line</th>
         </tr>
 
-        <% methods.sort.reverse_each do |method|
+        <% min_time = @options[:min_time] || (@options[:nonzero] ? 0.005 : nil)
+           methods.sort.reverse_each do |method|
             total_percentage = (method.total_time/total_time) * 100
             next if total_percentage < min_percent
+            next if min_time && method.total_time < min_time
             self_percentage = (method.self_time/total_time) * 100 %>
           
             <!-- Parents -->
-            <% for caller in method.parents %> 
+            <% for caller in method.parents %>
+            <%   next if min_time && caller.total_time < min_time  %>
               <tr>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
@@ -198,8 +209,8 @@ module RubyProf
                 <td><%= sprintf("%#{TIME_WIDTH}.2f", caller.children_time) %></td>
                 <% called = "#{caller.called}/#{method.called}" %>
                 <td><%= sprintf("%#{CALL_WIDTH}s", called) %></td>
-                <td><%= create_link(thread_id, caller.target) %></td>
-                <td><a href="file://<%= File.expand_path(caller.target.source_file) %>#line=<%= caller.line %>"><%= caller.line %></a></td>
+                <td class="method_name"><%= create_link(thread_id, caller.target) %></td>
+                <td><a href="file://<%=h srcfile=File.expand_path(caller.target.source_file) %>#line=<%= linenum=caller.line %>" title="<%=h srcfile %>:<%= linenum %>"><%= caller.line %></a></td>
               </tr>
             <% end %>
 
@@ -211,12 +222,13 @@ module RubyProf
               <td><%= sprintf("%#{TIME_WIDTH}.2f", method.wait_time) %></td>
               <td><%= sprintf("%#{TIME_WIDTH}.2f", method.children_time) %></td>
               <td><%= sprintf("%#{CALL_WIDTH}i", method.called) %></td>
-              <td><a name="<%= method_href(thread_id, method) %>"><%= h method.full_name %></a></td>
-              <td><a href="file://<%= File.expand_path(method.source_file) %>#line=<%= method.line %>"><%= method.line %></a></td>
+              <td class="method_name"><a name="<%= method_href(thread_id, method) %>"><%= h method.full_name %></a></td>
+              <td><a href="file://<%=h srcfile=File.expand_path(method.source_file) %>#line=<%= linenum=method.line %>" title="<%=h srcfile %>:<%= linenum %>"><%= method.line %></a></td>
             </tr>
 
             <!-- Children -->
-            <% for callee in method.children %> 
+            <% for callee in method.children %>
+            <%   next if min_time && callee.total_time < min_time  %>
               <tr>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
@@ -226,12 +238,12 @@ module RubyProf
                 <td><%= sprintf("%#{TIME_WIDTH}.2f", callee.children_time) %></td>
                 <% called = "#{callee.called}/#{callee.target.called}" %>
                 <td><%= sprintf("%#{CALL_WIDTH}s", called) %></td>
-                <td><%= create_link(thread_id, callee.target) %></td>
-                <td><a href="file://<%= File.expand_path(method.source_file) %>#line=<%= callee.line %>"><%= callee.line %></a></td>
+                <td class="method_name"><%= create_link(thread_id, callee.target) %></td>
+                <td><a href="file://<%=h srcfile=File.expand_path(method.source_file) %>#line=<%= linenum=callee.line %>" title="<%=h srcfile %>:<%= linenum %>"><%= callee.line %></a></td>
               </tr>
             <% end %>
             <!-- Create divider row -->
-            <tr class="break"><td colspan="8"></td></tr>
+            <tr class="break"><td colspan="9"></td></tr>
         <% end %>
       </table>
     <% end %>

data/test/basic_test.rb

@@ -88,10 +88,10 @@ class BasicTest < Test::Unit::TestCase
       C1.hello
       C1.new.hello
     end
- 
+    
     methods = result.threads.values.first
     
-    # Length should be 6:
+    # Length should be 7:
     #   1 test_class_and_instance_methods (this method)
     #   1 Class.new
     #   1 Class:Object allocate
@@ -108,9 +108,15 @@ class BasicTest < Test::Unit::TestCase
     assert_equal('Kernel#sleep', methods[1].full_name)
     assert_equal('C1#hello', methods[2].full_name)
     assert_equal('<Class::C1>#hello', methods[3].full_name)
-    assert_equal('Class#new', methods[4].full_name)
-    assert_equal('<Class::Object>#allocate', methods[5].full_name)
-    assert_equal('Object#initialize', methods[6].full_name)
+    
+    # The last three methods have total times of zero
+    assert_equal(0, methods[4].total_time)
+    assert_equal(0, methods[5].total_time)
+    assert_equal(0, methods[6].total_time)
+    
+    #assert_equal('Class#new', methods[4].full_name)
+    #assert_equal('<Class::Object>#allocate', methods[5].full_name)
+    #assert_equal('Object#initialize', methods[6].full_name)
   end
   
   def test_module_methods
@@ -128,7 +134,7 @@ class BasicTest < Test::Unit::TestCase
     #   1 Object#initialize
     #   1 M1#hello
     #   1 Kernel#sleep
-    
+
     assert_equal(6, methods.length)
 
     # Check the names
@@ -137,9 +143,15 @@ class BasicTest < Test::Unit::TestCase
     assert_equal('BasicTest#test_module_methods', methods[0].full_name)
     assert_equal('Kernel#sleep', methods[1].full_name)
     assert_equal('M1#hello', methods[2].full_name)
-    assert_equal('<Class::Object>#allocate', methods[3].full_name)
-    assert_equal('Class#new', methods[4].full_name)
-    assert_equal('Object#initialize', methods[5].full_name)
+    
+    # The last three methods have times of zero
+    assert_equal(0, methods[3].total_time)
+    assert_equal(0, methods[4].total_time)
+    assert_equal(0, methods[5].total_time)
+    
+    #assert_equal('<Class::Object>#allocate', methods[3].full_name)
+    #assert_equal('Class#new', methods[4].full_name)
+    #assert_equal('Object#initialize', methods[5].full_name)
   end
   
   def test_singleton

data/test/measure_mode_test.rb

@@ -60,7 +60,7 @@ class MeasureModeTest < Test::Unit::TestCase
   end
   
   def test_allocated_objects
-    return unless RubyProf.constants.include?('ALLOCATIONS')
+    return if RubyProf::ALLOCATIONS.nil?
     
     RubyProf::measure_mode = RubyProf::ALLOCATIONS
     

data/test/printers_test.rb

@@ -7,24 +7,68 @@ require 'test_helper'
 
 # --  Tests ----
 class PrintersTest < Test::Unit::TestCase
-  def test_printers
-    result = RubyProf.profile do
+  
+  def setup
+    @result = RubyProf.profile do
       run_primes
     end
+  end
     
-    printer = RubyProf::FlatPrinter.new(result)
+  def test_printers
+    printer = RubyProf::FlatPrinter.new(@result)
     printer.print(STDOUT)
     
-    printer = RubyProf::GraphHtmlPrinter.new(result)
+    printer = RubyProf::GraphHtmlPrinter.new(@result)
     printer.print
     
-    printer = RubyProf::GraphPrinter.new(result)
+    printer = RubyProf::GraphPrinter.new(@result)
     printer.print
     
-    printer = RubyProf::CallTreePrinter.new(result)
+    printer = RubyProf::CallTreePrinter.new(@result)
     printer.print(STDOUT)
 
     # we should get here
     assert(true)
   end
+
+  def test_flatprinter_duckfriendliness
+    output = ''
+    
+    printer = RubyProf::FlatPrinter.new(@result)
+    assert_nothing_raised { printer.print( output ) }
+    
+    assert_match( /Thread ID: \d+/i, output )
+    assert_match( /Total: \d+\.\d+/i, output )
+    assert_match( /Object#run_primes/i, output )
+  end
+    
+  def test_graphhtmlprinter_duckfriendliness
+    output = ''
+    printer = RubyProf::GraphHtmlPrinter.new(@result)
+    assert_nothing_raised { printer.print(output) }
+
+    assert_match( /DTD HTML 4\.01/i, output )
+    assert_match( %r{<th>Total Time</th>}i, output )
+    assert_match( /Object#run_primes/i, output )
+  end
+    
+  def test_graphprinter_duckfriendliness
+    output = ''
+    printer = RubyProf::GraphPrinter.new(@result)
+    assert_nothing_raised { printer.print(output) }
+
+    assert_match( /Thread ID: \d+/i, output )
+    assert_match( /Total Time: \d+\.\d+/i, output )
+    assert_match( /Object#run_primes/i, output )
+  end
+    
+  def test_calltreeprinter_duckfriendliness
+    output = ''
+    printer = RubyProf::CallTreePrinter.new(@result)
+    assert_nothing_raised { printer.print(output) }
+
+    assert_match(/fn=Object::find_primes/i, output)
+    assert_match(/events: process_time/i, output)
+  end
+
 end

data/test/recursive_test.rb

@@ -49,6 +49,7 @@ class RecursiveTest < Test::Unit::TestCase
       end
     end
     
+    
     methods = result.threads.values.first.sort.reverse
     assert_equal(6, methods.length)   
 
@@ -93,7 +94,7 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal(3, method.children.length)
     
     method = methods[4]
-    assert_equal('Fixnum#-', method.full_name)
+    assert_equal('Fixnum#==', method.full_name)
     assert_in_delta(0, method.total_time, 0.02)
     assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(0, method.wait_time, 0.02)
@@ -103,7 +104,7 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal(0, method.children.length)
     
     method = methods[5]
-    assert_equal('Fixnum#==', method.full_name)
+    assert_equal('Fixnum#-', method.full_name)
     assert_in_delta(0, method.total_time, 0.02)
     assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(0, method.wait_time, 0.02)

data/test/test_helper.rb

@@ -15,7 +15,8 @@ def check_parent_times(method)
     sum + call_info.self_time
   end
 
-  assert_in_delta(method.self_time, parents_self_time, 0.01, method.full_name) 
+  assert_in_delta(method.self_time, parents_self_time, 0.01, 
+                  "Invalid parent times for method #{method.full_name}")
     
   parents_wait_time = method.parents.inject(0) do |sum, call_info|
     sum + call_info.wait_time
@@ -26,7 +27,9 @@ def check_parent_times(method)
   parents_children_time = method.parents.inject(0) do |sum, call_info|
     sum + call_info.children_time
   end
-  assert_in_delta(method.children_time, parents_children_time, 0.01, method.full_name)
+  
+  assert_in_delta(method.children_time, parents_children_time, 0.01,
+                  "Invalid child times for method #{method.full_name}")
 end
   
 def check_parent_calls(method)
@@ -35,7 +38,9 @@ def check_parent_calls(method)
   parent_calls = method.parents.inject(0) do |sum, call_info|
     sum + call_info.called
   end
-  assert_equal(method.called, parent_calls, method.full_name)  
+  
+  assert_equal(method.called, parent_calls,  
+                  "Invalid parent calls for method #{method.full_name}")
 end
   
 def check_child_times(method)
@@ -45,5 +50,6 @@ def check_child_times(method)
     sum + call_info.total_time
   end
   
-  assert_in_delta(method.children_time, children_total_time, 0.01, method.full_name)
+  assert_in_delta(method.children_time, children_total_time, 0.01,
+                  "Invalid child time for method #{method.full_name}")
 end

data/test/thread_test.rb

@@ -120,6 +120,9 @@ class ThreadTest < Test::Unit::TestCase
       end
     end
     
+    printer = RubyProf::GraphPrinter.new(result)
+    printer.print
+    
     result.threads.each do |thread_id, methods|
       STDOUT << "thread: " << thread_id << "\n"
       methods.each do |method|

metadata

@@ -1,33 +1,32 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2007-07-19 14:02:03 -06:00
-summary: Fast Ruby profiler
-require_paths: 
-- lib
-email: shugo@ruby-lang.org and cfis@savagexi.com
-homepage: http://rubyforge.org/projects/ruby-prof/
-rubyforge_project: ruby-prof
-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.
-autorequire: ruby-prof
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.4
-  version: 
+  version: 0.6.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Shugo Maeda and Charlie Savage
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-03 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+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 and cfis@savagexi.com
+executables: 
+- ruby-prof
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- bin/ruby-prof
+- ext/ruby_prof.c
+- examples/flat.txt
+- examples/graph.txt
+- examples/graph.html
+- README
+- LICENSE
 files: 
 - Rakefile
 - README
@@ -39,6 +38,7 @@ files:
 - lib/unprof.rb
 - lib/ruby-prof/abstract_printer.rb
 - lib/ruby-prof/call_tree_printer.rb
+- lib/ruby-prof/call_tree_printer.rb.rej
 - lib/ruby-prof/flat_printer.rb
 - lib/ruby-prof/graph_html_printer.rb
 - lib/ruby-prof/graph_printer.rb
@@ -52,14 +52,15 @@ files:
 - examples/graph.html
 - examples/graph.txt
 - ext/extconf.rb
+- ext/extconf.rb.rej
 - ext/measure_allocations.h
 - ext/measure_cpu_time.h
+- ext/measure_memory.h
 - ext/measure_process_time.h
 - ext/measure_wall_time.h
 - ext/ruby_prof.c
 - test/basic_test.rb
 - test/duplicate_names_test.rb
-- test/gc.log
 - test/line_number_test.rb
 - test/measure_mode_test.rb
 - test/module_test.rb
@@ -78,9 +79,9 @@ files:
 - test/test_suite.rb
 - test/thread_test.rb
 - test/timing_test.rb
-test_files: 
-- test/test_helper.rb
-- test/test_suite.rb
+has_rdoc: true
+homepage: http://rubyforge.org/projects/ruby-prof/
+post_install_message: 
 rdoc_options: 
 - --title
 - ruby-prof
@@ -88,19 +89,27 @@ rdoc_options:
 - --line-numbers
 - --main
 - README
-extra_rdoc_files: 
-- bin/ruby-prof
-- ext/ruby_prof.c
-- examples/flat.txt
-- examples/graph.txt
-- examples/graph.html
-- README
-- LICENSE
-executables: 
-- ruby-prof
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.4
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: ruby-prof
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Fast Ruby profiler
+test_files: 
+- test/test_helper.rb
+- test/test_suite.rb