ruby-prof 0.8.1-x86-mingw32 → 0.11.0.rc1-x86-mingw32

data/lib/ruby-prof/graph_html_printer.rb

@@ -1,9 +1,10 @@
-require 'ruby-prof/abstract_printer'
+# encoding: utf-8
+
 require 'erb'
 
 module RubyProf
-  # Generates graph[link:files/examples/graph_html.html] profile reports as html. 
-  # To use the grap html printer:
+  # Generates graph[link:files/examples/graph_html.html] profile reports as html.
+  # To use the graph html printer:
   #
   #   result = RubyProf.profile do
   #     [code to profile]
@@ -14,20 +15,20 @@ module RubyProf
   #
   # The constructor takes two arguments.  The first is
   # a RubyProf::Result object generated from a profiling
-  # run.  The second is the minimum %total (the methods 
+  # run.  The second is the minimum %total (the methods
   # total time divided by the overall total time) that
-  # a method must take for it to be printed out in 
+  # a method must take for it to be printed out in
   # the report.  Use this parameter to eliminate methods
   # that are not important to the overall profiling results.
-  
+
   class GraphHtmlPrinter < AbstractPrinter
     include ERB::Util
-    
+
     PERCENTAGE_WIDTH = 8
     TIME_WIDTH = 10
     CALL_WIDTH = 20
-  
-    # Create a GraphPrinter.  Result is a RubyProf::Result  
+
+    # Create a GraphPrinter.  Result is a RubyProf::Result
     # object generated from a profiling run.
     def initialize(result)
       super(result)
@@ -36,17 +37,24 @@ module RubyProf
     end
 
     # Print a graph html report to the provided output.
-    # 
-    # output - Any IO oject, including STDOUT or a file. 
+    #
+    # output - Any IO oject, including STDOUT or a file.
     # The default value is STDOUT.
-    # 
-    # options - Hash of print options.  See #setup_options 
-    #           for more information.
+    #
+    # options - Hash of print options.  See #setup_options
+    # for more information.
+    #
+    # unique options are:
+    #   :filename    - specify a file to use that contains the ERB
+    #                  template to use, instead of the built-in self.template
+    #
+    #   :template    - specify an ERB template to use, instead of the
+    #                  built-in self.template
     #
     def print(output = STDOUT, options = {})
       @output = output
       setup_options(options)
-      
+
       filename = options[:filename]
       template = filename ? File.read(filename).untaint : (options[:template] || self.template)
       _erbout = @output
@@ -55,38 +63,46 @@ module RubyProf
       @output << erb.result(binding)
     end
 
+    def total_time(call_infos)
+      sum(call_infos.map{|ci| ci.total_time})
+    end
+
+    def sum(a)
+      a.inject(0.0){|s,t| s+=t}
+    end
+
     # These methods should be private but then ERB doesn't
-    # work.  Turn off RDOC though 
+    # work.  Turn off RDOC though
     #--
     def calculate_thread_times
       # Cache thread times since this is an expensive
-      # operation with the required sorting      
+      # operation with the required sorting
+      @overall_threads_time = 0.0
+      @thread_times = Hash.new
       @result.threads.each do |thread_id, methods|
-        top = methods.max
-        
-        thread_time = 0.01
-        thread_time = top.total_time if top.total_time > 0
-
-        @thread_times[thread_id] = thread_time 
+        roots = methods.select{|m| m.root?}
+        thread_total_time = sum(roots.map{|r| self.total_time(r.call_infos)})
+        @overall_threads_time += thread_total_time
+        @thread_times[thread_id] = thread_total_time
       end
     end
-    
+
     def thread_time(thread_id)
       @thread_times[thread_id]
     end
-   
+
     def total_percent(thread_id, method)
       overall_time = self.thread_time(thread_id)
       (method.total_time/overall_time) * 100
     end
-    
+
     def self_percent(method)
       overall_time = self.thread_time(method.thread_id)
       (method.self_time/overall_time) * 100
     end
 
     # Creates a link to a method.  Note that we do not create
-    # links to methods which are under the min_perecent 
+    # links to methods which are under the min_perecent
     # specified by the user, since they will not be
     # printed out.
     def create_link(thread_id, method)
@@ -95,14 +111,27 @@ module RubyProf
         h method.full_name
       else
         href = '#' + method_href(thread_id, method)
-        "<a href=\"#{href}\">#{h method.full_name}</a>" 
+        "<a href=\"#{href}\">#{h method.full_name}</a>"
       end
     end
-    
+
     def method_href(thread_id, method)
       h(method.full_name.gsub(/[><#\.\?=:]/,"_") + "_" + thread_id.to_s)
     end
-    
+
+    def file_link(path, linenum)
+      srcfile = File.expand_path(path)
+      if srcfile =~ /\/ruby_runtime$/
+        ""
+      else
+        if RUBY_PLATFORM =~ /darwin/
+          "<a href=\"txmt://open?url=file://#{h srcfile}&line=#{linenum}\" title=\"#{h srcfile}:#{linenum}\">#{linenum}</a>"
+        else
+          "<a href=\"file://#{h srcfile}##{linenum}\" title=\"#{h srcfile}:#{linenum}\">#{linenum}</a>"
+        end
+      end
+    end
+
     def template
 '
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -149,7 +178,7 @@ module RubyProf
     td {
       border-left: 1px solid #CCC;
       text-align: center;
-    } 
+    }
 
     .method_name {
       text-align: left;
@@ -164,7 +193,7 @@ module RubyProf
         <th>Thread ID</th>
         <th>Total Time</th>
       </tr>
-      <% for thread_id, methods in @result.threads %>
+      <% for thread_id in @result.threads.keys.sort %>
       <tr>
         <td><a href="#<%= thread_id %>"><%= thread_id %></a></td>
         <td><%= thread_time(thread_id) %></td>
@@ -173,7 +202,8 @@ module RubyProf
     </table>
 
     <!-- Methods Tables -->
-    <% for thread_id, methods in @result.threads
+    <% for thread_id in @result.threads.keys.sort
+         methods = @result.threads[thread_id]
          total_time = thread_time(thread_id) %>
       <h2><a name="<%= thread_id %>">Thread <%= thread_id %></a></h2>
 
@@ -191,12 +221,12 @@ module RubyProf
         </tr>
 
         <% min_time = @options[:min_time] || (@options[:nonzero] ? 0.005 : nil)
-           methods.sort.reverse_each do |method|
+           methods.sort_by(&sort_method).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.aggregate_parents.sort_by(&:total_time)
                  next unless caller.parent
@@ -211,7 +241,7 @@ module RubyProf
                 <% called = "#{caller.called}/#{method.called}" %>
                 <td><%= sprintf("%#{CALL_WIDTH}s", called) %></td>
                 <td class="method_name"><%= create_link(thread_id, caller.parent.target) %></td>
-                <td><a href="file://<%=h srcfile=File.expand_path(caller.parent.target.source_file) %>#line=<%= linenum=caller.line %>" title="<%=h srcfile %>:<%= linenum %>"><%= caller.line %></a></td>
+                <td><%= file_link(caller.parent.target.source_file, caller.line) %></td>
               </tr>
             <% end %>
 
@@ -224,7 +254,7 @@ module RubyProf
               <td><%= sprintf("%#{TIME_WIDTH}.2f", method.children_time) %></td>
               <td><%= sprintf("%#{CALL_WIDTH}i", method.called) %></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>
+              <td><%= file_link(method.source_file, method.line) %></td>
             </tr>
 
             <!-- Children -->
@@ -240,7 +270,7 @@ module RubyProf
                 <% called = "#{callee.called}/#{callee.target.called}" %>
                 <td><%= sprintf("%#{CALL_WIDTH}s", called) %></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>
+                <td><%= file_link(method.source_file, callee.line) %></td>
               </tr>
             <% end %>
             <!-- Create divider row -->
@@ -252,5 +282,5 @@ module RubyProf
 </html>'
     end
   end
-end 
+end
 

data/lib/ruby-prof/graph_printer.rb

@@ -1,15 +1,15 @@
-require 'ruby-prof/abstract_printer'
+# encoding: utf-8
 
 module RubyProf
-  # Generates graph[link:files/examples/graph_txt.html] profile reports as text. 
+  # Generates graph[link:files/examples/graph_txt.html] profile reports as text.
   # To use the graph printer:
   #
   #   result = RubyProf.profile do
   #     [code to profile]
   #   end
   #
-  #   printer = RubyProf::GraphPrinter.new(result, 5)
-  #   printer.print(STDOUT, 0)
+  #   printer = RubyProf::GraphPrinter.new(result)
+  #   printer.print(STDOUT, {})
   #
   # The constructor takes two arguments. See the README
 
@@ -17,8 +17,8 @@ module RubyProf
     PERCENTAGE_WIDTH = 8
     TIME_WIDTH = 10
     CALL_WIDTH = 17
-  
-    # Create a GraphPrinter.  Result is a RubyProf::Result  
+
+    # Create a GraphPrinter.  Result is a RubyProf::Result
     # object generated from a profiling run.
     def initialize(result)
       super(result)
@@ -28,23 +28,23 @@ module RubyProf
 
     def calculate_thread_times
       # Cache thread times since this is an expensive
-      # operation with the required sorting      
+      # operation with the required sorting
       @result.threads.each do |thread_id, methods|
         top = methods.max
-        
+
         thread_time = [top.total_time, 0.01].max
-        
-        @thread_times[thread_id] = thread_time 
+
+        @thread_times[thread_id] = thread_time
       end
     end
-    
+
     # Print a graph report to the provided output.
-    # 
-    # output - Any IO oject, including STDOUT or a file. 
+    #
+    # output - Any IO oject, including STDOUT or a file.
     # The default value is STDOUT.
-    # 
-    # options - Hash of print options.  See #setup_options 
-    #           for more information.
+    #
+    # options - Hash of print options.  See #setup_options
+    # for more information.
     #
     def print(output = STDOUT, options = {})
       @output = output
@@ -52,7 +52,7 @@ module RubyProf
       print_threads
     end
 
-    private 
+    private
     def print_threads
       # sort assumes that spawned threads have higher object_ids
       @result.threads.sort.each do |thread_id, methods|
@@ -60,30 +60,30 @@ module RubyProf
         @output << "\n" * 2
       end
     end
-    
+
     def print_methods(thread_id, methods)
       # Sort methods from longest to shortest total time
-      methods = methods.sort
-      
+      methods = methods.sort_by(&sort_method)
+
       toplevel = methods.last
       total_time = toplevel.total_time
       if total_time == 0
         total_time = 0.01
       end
-      
+
       print_heading(thread_id)
-    
+
       # Print each method in total time order
       methods.reverse_each do |method|
         total_percentage = (method.total_time/total_time) * 100
         self_percentage = (method.self_time/total_time) * 100
-        
+
         next if total_percentage < min_percent
-        
+
         @output << "-" * 80 << "\n"
 
         print_parents(thread_id, method)
-    
+
         # 1 is for % sign
         @output << sprintf("%#{PERCENTAGE_WIDTH-1}.2f\%", total_percentage)
         @output << sprintf("%#{PERCENTAGE_WIDTH-1}.2f\%", self_percentage)
@@ -95,18 +95,18 @@ module RubyProf
         @output << sprintf("     %s", method_name(method))
         if print_file
           @output << sprintf("  %s:%s", method.source_file, method.line)
-        end          
+        end
         @output << "\n"
-    
+
         print_children(method)
       end
     end
-  
+
     def print_heading(thread_id)
       @output << "Thread ID: #{thread_id}\n"
       @output << "Total Time: #{@thread_times[thread_id]}\n"
       @output << "\n"
-      
+
       # 1 is for % sign
       @output << sprintf("%#{PERCENTAGE_WIDTH}s", "%total")
       @output << sprintf("%#{PERCENTAGE_WIDTH}s", "%self")
@@ -118,7 +118,7 @@ module RubyProf
       @output << "   Name"
       @output << "\n"
     end
-    
+
     def print_parents(thread_id, method)
       method.aggregate_parents.sort_by(&:total_time).each do |caller|
         next unless caller.parent
@@ -127,20 +127,20 @@ module RubyProf
         @output << sprintf("%#{TIME_WIDTH}.2f", caller.self_time)
         @output << sprintf("%#{TIME_WIDTH}.2f", caller.wait_time)
         @output << sprintf("%#{TIME_WIDTH}.2f", caller.children_time)
-    
+
         call_called = "#{caller.called}/#{method.called}"
         @output << sprintf("%#{CALL_WIDTH}s", call_called)
         @output << sprintf("     %s", caller.parent.target.full_name)
         @output << "\n"
       end
     end
-  
+
     def print_children(method)
       method.aggregate_children.sort_by(&:total_time).reverse.each do |child|
         # Get children method
-        
+
         @output << " " * 2 * PERCENTAGE_WIDTH
-        
+
         @output << sprintf("%#{TIME_WIDTH}.2f", child.total_time)
         @output << sprintf("%#{TIME_WIDTH}.2f", child.self_time)
         @output << sprintf("%#{TIME_WIDTH}.2f", child.wait_time)
@@ -153,5 +153,5 @@ module RubyProf
       end
     end
   end
-end 
+end
 

data/lib/ruby-prof/method_info.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module RubyProf
   class MethodInfo
     include Comparable
@@ -27,11 +29,12 @@ module RubyProf
     def total_time
       @total_time ||= begin
         call_infos.inject(0) do |sum, call_info|
-          sum += call_info.total_time
+          sum += call_info.total_time if call_info.minimal?
+          sum
         end
       end
     end
-    
+
     def self_time
       @self_time ||= begin
         call_infos.inject(0) do |sum, call_info|
@@ -51,7 +54,8 @@ module RubyProf
     def children_time
       @children_time ||= begin
         call_infos.inject(0) do |sum, call_info|
-          sum += call_info.children_time
+          sum += call_info.children_time if call_info.minimal?
+          sum
         end
       end
     end
@@ -107,5 +111,23 @@ module RubyProf
     def to_s
       full_name
     end
+
+    def dump
+      res = ""
+      res << "MINFO: #{klass_name}##{method_name} total_time: #{total_time} (#{full_name})\n"
+      call_infos.each do |ci|
+        pinfo = ci.root? ? "TOPLEVEL" : (p=ci.parent.target; "#{p.klass_name}##{p.method_name} (#{ci.parent.object_id}) (#{p.full_name})")
+        res << "CINFO[#{ci.object_id}] called #{ci.called} times from #{pinfo}\n"
+      end
+      res
+    end
+
+    # remove method from the call graph. should not be called directly.
+    def eliminate!
+      # $stderr.puts "eliminating #{self}"
+      call_infos.each{ |call_info| call_info.eliminate! }
+      call_infos.clear
+    end
+
   end
-end
+end