ruby-prof 0.15.5 → 0.15.6

data/lib/ruby-prof/printers/graph_printer.rb

@@ -48,12 +48,11 @@ module RubyProf
       # 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"
+        self_percentage = (method.self_time/total_time) * 100
 
+        @output << "-" * 80 << "\n"
         print_parents(thread, method)
 
         # 1 is for % sign
@@ -71,7 +70,9 @@ module RubyProf
         end
         @output << "\n"
 
+        method.recalc_recursion unless method.non_recursive?
         print_children(method)
+        thread.recalc_recursion unless method.non_recursive?
       end
     end
 

data/lib/ruby-prof/profile.rb

@@ -8,28 +8,7 @@ module RubyProf
     # a hook to do any necessary post-processing on the call graph.
     def post_process
       self.threads.each do |thread|
-        detect_recursion(thread)
-      end
-    end
-
-    # This method detect recursive calls in the call graph.
-    def detect_recursion(thread)
-      visited_methods = Hash.new do |hash, key|
-        hash[key] = 0
-      end
-
-      visitor = CallInfoVisitor.new(thread)
-      visitor.visit do |call_info, event|
-        case event
-        when :enter
-          if (visited_methods[call_info.target] += 1) > 1
-            call_info.recursive = true
-          end
-        when :exit
-          if (visited_methods[call_info.target] -= 1) == 0
-            visited_methods.delete(call_info.target)
-          end
-        end
+        thread.detect_recursion
       end
     end
 

data/lib/ruby-prof/thread.rb

@@ -2,12 +2,24 @@ module RubyProf
   class Thread
     def top_methods
       self.methods.select do |method_info|
-        method_info.call_infos.detect do |call_info|
-          call_info.parent.nil?
-        end
+        method_info.call_infos.detect(&:root?)
       end
     end
 
+    def top_call_infos
+      top_methods.map(&:call_infos).flatten.select(&:root?)
+    end
+
+    # This method detect recursive calls in the call tree of a given thread
+    # It should be called only once for each thread
+    def detect_recursion
+      top_call_infos.each(&:detect_recursion)
+    end
+
+    def recalc_recursion
+      top_call_infos.each(&:recalc_recursion)
+    end
+
     def total_time
       self.top_methods.inject(0) do |sum, method_info|
         method_info.call_infos.each do |call_info|

data/lib/ruby-prof/version.rb

@@ -1,3 +1,3 @@
 module RubyProf
-  VERSION = "0.15.5"
+  VERSION = "0.15.6"
 end

data/test/call_info_visitor_test.rb

@@ -14,7 +14,7 @@ class CallInfoVisitorTest < TestCase
       RubyProf::C1.hello
     end
 
-    visitor = RubyProf::CallInfoVisitor.new(result.threads.first)
+    visitor = RubyProf::CallInfoVisitor.new(result.threads.first.top_call_infos)
 
     method_names = Array.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.15.6
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes