ruby-prof 0.13.1 → 0.14.0

data/ext/ruby_prof/ruby_prof.h

@@ -8,26 +8,25 @@
 #include <stdio.h>
 
 #if RUBY_VERSION == 186
-# error 1.8.6 is not supported.  Please upgrade to 1.8.7 or 1.9.2 or higher.
+# error 1.8.6 is not supported. Please upgrade to 1.9.3 or higher.
+#endif
+
+#if RUBY_VERSION == 187
+# error 1.8.7 is not supported. Please upgrade to 1.9.3 or higher.
 #endif
 
 #if RUBY_VERSION == 190
-# error 1.9.0 is not supported.  Please upgrade to 1.9.2 or higher.
+# error 1.9.0 is not supported. Please upgrade to 1.9.3 or higher.
 #endif
 
 #if RUBY_VERSION == 191
-# error 1.9.1 is not supported.  Please upgrade to 1.9.2 or higher.
+# error 1.9.1 is not supported. Please upgrade to 1.9.3 or higher.
 #endif
 
-#ifndef RUBY_VM
-#include <node.h>
-typedef rb_event_t rb_event_flag_t;
-#define rb_sourcefile() (node ? node->nd_file : 0)
-#define rb_sourceline() (node ? nd_line(node) : 0)
+#if RUBY_VERSION == 192
+# error 1.9.2 is not supported. Please upgrade to 1.9.3 or higher.
 #endif
 
-#include "version.h"
-
 #include "rp_measure.h"
 #include "rp_method.h"
 #include "rp_call_info.h"

data/lib/ruby-prof.rb

@@ -8,6 +8,7 @@ rescue LoadError
   require "ruby_prof"
 end
 
+require 'ruby-prof/version'
 require 'ruby-prof/aggregate_call_info'
 require 'ruby-prof/call_info'
 require 'ruby-prof/call_info_visitor'
@@ -64,4 +65,4 @@ module RubyProf
   end
 end
 
-RubyProf::figure_measure_mode
+RubyProf::figure_measure_mode

data/lib/ruby-prof/aggregate_call_info.rb

@@ -56,16 +56,14 @@ module RubyProf
     private
 
     def aggregate(method_name)
-      self.call_infos.inject(0) do |sum, call_info|
-        sum += call_info.send(method_name)
-        sum
+      call_infos.inject(0) do |sum, call_info|
+        sum + call_info.send(method_name)
       end
     end
 
     def aggregate_without_recursion(method_name)
-      self.call_infos.inject(0) do |sum, call_info|
-        sum += call_info.send(method_name) unless call_info.recursive
-        sum
+      call_infos.inject(0) do |sum, call_info|
+        call_info.recursive ? sum : sum + call_info.send(method_name)
       end
     end
   end

data/lib/ruby-prof/call_info_visitor.rb

@@ -1,44 +1,42 @@
-# The call info visitor class does a depth-first traversal
-# across a thread's call stack.  At each call_info node,
-# the visitor executes the block provided in the
-# #visit method.  The block is passed two parameters, the
-# event and the call_info instance.  Event will be
-# either :enter or :exit.
-#
-#   visitor = RubyProf::CallInfoVisitor.new(result.threads.first)
-#
-#   method_names = Array.new
-#
-#   visitor.visit do |call_info, event|
-#     method_names << call_info.target.full_name if event == :enter
-#   end
-#
-#   puts method_names
-
-module RubyProf
-  class CallInfoVisitor
-    attr_reader :block, :thread
-
-    def initialize(thread)
-      @thread = thread
-    end
-
-    def visit(&block)
-      @block = block
-
-      self.thread.top_methods.each do |method_info|
-        method_info.call_infos.each do |call_info|
-          self.visit_call_info(call_info)
-        end
-      end
-    end
-
-    def visit_call_info(call_info)
-      self.block.call(call_info, :enter)
-      call_info.children.each do |child|
-        visit_call_info(child)
-      end
-      self.block.call(call_info, :exit)
-    end
-  end
-end
+# The call info visitor class does a depth-first traversal
+# across a thread's call stack.  At each call_info node,
+# the visitor executes the block provided in the
+# #visit method.  The block is passed two parameters, the
+# event and the call_info instance.  Event will be
+# either :enter or :exit.
+#
+#   visitor = RubyProf::CallInfoVisitor.new(result.threads.first)
+#
+#   method_names = Array.new
+#
+#   visitor.visit do |call_info, event|
+#     method_names << call_info.target.full_name if event == :enter
+#   end
+#
+#   puts method_names
+
+module RubyProf
+  class CallInfoVisitor
+
+    def initialize(thread)
+      @thread = thread
+    end
+
+    def visit(&block)
+      @thread.top_methods.each do |method_info|
+        method_info.call_infos.each do |call_info|
+          visit_call_info(call_info, &block)
+        end
+      end
+    end
+
+    private
+    def visit_call_info(call_info, &block)
+      yield call_info, :enter
+      call_info.children.each do |child|
+        visit_call_info(child, &block)
+      end
+      yield call_info, :exit
+    end
+  end
+end

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

@@ -138,16 +138,12 @@ module RubyProf
     <table>
       <tr>
         <th>Thread ID</th>
-        <% if RUBY_VERSION >= "1.9" %>
         <th>Fiber ID</th>
-        <% end %>
         <th>Total Time</th>
       </tr>
       <% for thread in @result.threads %>
       <tr>
-        <% if RUBY_VERSION >= "1.9" %>
         <td><%= thread.id %></td>
-        <% end %>
         <td><a href="#<%= thread.fiber_id %>"><%= thread.fiber_id %></a></td>
         <td><%= thread.total_time %></td>
       </tr>
@@ -158,11 +154,7 @@ module RubyProf
     <% for thread in @result.threads
          methods = thread.methods
          total_time = thread.total_time %>
-      <% if RUBY_VERSION >= "1.9" %>
       <h2><a name="<%= thread.fiber_id %>">Thread <%= thread.id %>, Fiber: <%= thread.fiber_id %></a></h2>
-      <% else %>
-      <h2><a name="<%= thread.fiber_id %>">Thread <%= thread.fiber_id %></a></h2>
-      <% end %>
       <table>
         <thead>
           <tr>

data/lib/ruby-prof/profile.rb

@@ -22,11 +22,11 @@ module RubyProf
       visitor.visit do |call_info, event|
         case event
         when :enter
-          visited_methods[call_info.target] += 1
-          call_info.recursive = (visited_methods[call_info.target] > 1)
+          if (visited_methods[call_info.target] += 1) > 1
+            call_info.recursive = true
+          end
         when :exit
-          visited_methods[call_info.target] -= 1
-          if visited_methods[call_info.target] == 0
+          if (visited_methods[call_info.target] -= 1) == 0
             visited_methods.delete(call_info.target)
           end
         end

data/lib/ruby-prof/rack.rb

@@ -1,48 +1,48 @@
-# encoding: utf-8
-require 'tmpdir'
-
-module Rack
-  class RubyProf
-    def initialize(app, options = {})
-      @app = app
-      @options = options
-      @options[:min_percent] ||= 1
-      @tmpdir = options[:path] || Dir.tmpdir
-      @printer_klasses = @options[:printers]  || {::RubyProf::FlatPrinter => 'flat.txt',
-                                                  ::RubyProf::GraphPrinter => 'graph.txt',
-                                                  ::RubyProf::GraphHtmlPrinter => 'graph.html',
-                                                  ::RubyProf::CallStackPrinter => 'call_stack.html'}
-
-      @skip_paths = options[:skip_paths] || [%r{^/assets}, %r{\.css$}, %r{\.js$}, %r{\.png$}, %r{\.jpeg$}, %r{\.jpg$}, %r{\.gif$}]
-    end
-
-    def call(env)
-      request = Rack::Request.new(env)
-
-      if @skip_paths.any? {|skip_path| skip_path =~ request.path}
-        @app.call(env)
-      else
-        result = nil
-        data = ::RubyProf::Profile.profile do
-          result = @app.call(env)
-        end
-
-        path = request.path.gsub('/', '-')
-        path.slice!(0)
-
-        print(data, path)
-        result
-      end
-    end
-
-    def print(data, path)
-      @printer_klasses.each do |printer_klass, base_name|
-        printer = printer_klass.new(data)
-        file_name = ::File.join(@tmpdir, "#{path}-#{base_name}")
-        ::File.open(file_name, 'wb') do |file|
-          printer.print(file, @options)
-        end
-      end
-    end
-  end
+# encoding: utf-8
+require 'tmpdir'
+
+module Rack
+  class RubyProf
+    def initialize(app, options = {})
+      @app = app
+      @options = options
+      @options[:min_percent] ||= 1
+      @tmpdir = options[:path] || Dir.tmpdir
+      @printer_klasses = @options[:printers]  || {::RubyProf::FlatPrinter => 'flat.txt',
+                                                  ::RubyProf::GraphPrinter => 'graph.txt',
+                                                  ::RubyProf::GraphHtmlPrinter => 'graph.html',
+                                                  ::RubyProf::CallStackPrinter => 'call_stack.html'}
+
+      @skip_paths = options[:skip_paths] || [%r{^/assets}, %r{\.css$}, %r{\.js$}, %r{\.png$}, %r{\.jpeg$}, %r{\.jpg$}, %r{\.gif$}]
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+
+      if @skip_paths.any? {|skip_path| skip_path =~ request.path}
+        @app.call(env)
+      else
+        result = nil
+        data = ::RubyProf::Profile.profile do
+          result = @app.call(env)
+        end
+
+        path = request.path.gsub('/', '-')
+        path.slice!(0)
+
+        print(data, path)
+        result
+      end
+    end
+
+    def print(data, path)
+      @printer_klasses.each do |printer_klass, base_name|
+        printer = printer_klass.new(data)
+        file_name = ::File.join(@tmpdir, "#{path}-#{base_name}")
+        ::File.open(file_name, 'wb') do |file|
+          printer.print(file, @options)
+        end
+      end
+    end
+  end
 end

data/lib/ruby-prof/thread.rb

@@ -1,22 +1,22 @@
-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
-      end
-    end
-
-    def total_time
-      self.top_methods.inject(0) do |sum, method_info|
-        method_info.call_infos.each do |call_info|
-          if call_info.parent.nil?
-            sum += call_info.total_time
-          end
-        end
-        sum
-      end
-    end
-  end
-end
+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
+      end
+    end
+
+    def total_time
+      self.top_methods.inject(0) do |sum, method_info|
+        method_info.call_infos.each do |call_info|
+          if call_info.parent.nil?
+            sum += call_info.total_time
+          end
+        end
+        sum
+      end
+    end
+  end
+end

data/lib/ruby-prof/version.rb

@@ -0,0 +1,3 @@
+module RubyProf
+  VERSION = "0.14.0"
+end

data/ruby-prof.gemspec

@@ -1,12 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-# Read version from header file
-version_header = File.read(File.expand_path('../ext/ruby_prof/version.h', __FILE__))
-#match = version_header.match(/RUBY_PROF_VERSION\s*"(\.+)"/)
-match = version_header.match(/RUBY_PROF_VERSION\s*"([^"]+)"/)
-raise(RuntimeError, "Could not determine RUBY_PROF_VERSION") if not match
-
-RUBY_PROF_VERSION = "#{match[1]}"
+$:.push File.expand_path("../lib", __FILE__)
+require "ruby-prof/version"
 
 Gem::Specification.new do |spec|
   spec.name = "ruby-prof"
@@ -22,14 +17,14 @@ methods it called. RubyProf generate both text and html and can output
 it to standard out or to a file.
 EOF
 
-  spec.version = RUBY_PROF_VERSION
+  spec.version = RubyProf::VERSION
 
   spec.author = "Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes"
   spec.email = "shugo@ruby-lang.org, cfis@savagexi.com, rogerdpack@gmail.com, skaes@railsexpress.de"
   spec.platform = Gem::Platform::RUBY
   spec.require_path = "lib"
   spec.bindir = "bin"
-  spec.executables = ["ruby-prof"]
+  spec.executables = ["ruby-prof", "ruby-prof-check-trace"]
   spec.extensions = ["ext/ruby_prof/extconf.rb"]
   spec.files = Dir['CHANGES',
                    'LICENSE',
@@ -37,6 +32,7 @@ EOF
                    'README.rdoc',
                    'ruby-prof.gemspec',
                    'bin/ruby-prof',
+                   'bin/ruby-prof-check-trace',
                    'doc/**/*',
                    'examples/*',
                    'ext/ruby_prof/extconf.rb',
@@ -52,9 +48,9 @@ EOF
                    'test/*.rb']
 
   spec.test_files = Dir["test/test_*.rb"]
-  spec.required_ruby_version = '>= 1.8.7'
+  spec.required_ruby_version = '>= 1.9.3'
   spec.date = Time.now.strftime('%Y-%m-%d')
-  spec.homepage = 'https://github.com/rdp/ruby-prof'
+  spec.homepage = 'https://github.com/ruby-prof/ruby-prof'
   spec.add_development_dependency('minitest', '~> 4.0')
   spec.add_development_dependency('rake-compiler')
   spec.add_development_dependency('rdoc')

data/test/call_info_test.rb

@@ -1,78 +1,78 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class CallInfoTest < 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_clone
-#    result = RubyProf.profile do
-#      RubyProf::C1.hello
-#    end
-#
-#    method = result.threads.first.top_methods.first
-#    call_info = method.call_infos.first
-#    call_info_clone = call_info.clone
-#
-##    assert_equal(call_info.target, call_info_clone.target)
-#    assert_equal(call_info.total_time, call_info_clone.total_time)
-#  end
-
-  def test_merge
-    result1 = RubyProf.profile do
-      RubyProf::C1.hello
-    end
-
-    methods = result1.threads.first.methods.sort.reverse
-    assert_equal(3, methods.length)
-
-    assert_equal('CallInfoTest#test_merge', methods[0].full_name)
-    assert_in_delta(0.1, methods[0].total_time, 0.01)
-    assert_in_delta(0, methods[0].wait_time, 0.01)
-    assert_in_delta(0, methods[0].self_time, 0.01)
-    assert_equal(1, methods[0].called)
-
-    assert_equal('<Class::RubyProf::C1>#hello', methods[1].full_name)
-    assert_in_delta(0.1, methods[1].total_time, 0.01)
-    assert_in_delta(0, methods[1].wait_time, 0.01)
-    assert_in_delta(0, methods[1].self_time, 0.01)
-    assert_equal(1, methods[1].called)
-
-    assert_equal('Kernel#sleep', methods[2].full_name)
-    assert_in_delta(0.1, methods[2].total_time, 0.01)
-    assert_in_delta(0, methods[2].wait_time, 0.01)
-    assert_in_delta(0.1, methods[2].self_time, 0.01)
-    assert_equal(1, methods[2].called)
-
-    result2 = RubyProf.profile do
-      RubyProf::C1.hello
-    end
-
-    # Merge the trees
-    methods = result1.threads.first.methods.sort.reverse
-    assert_equal(3, methods.length)
-
-    assert_equal('CallInfoTest#test_merge', methods[0].full_name)
-    assert_in_delta(0.1, methods[0].total_time, 0.01)
-    assert_in_delta(0, methods[0].wait_time, 0.01)
-    assert_in_delta(0, methods[0].self_time, 0.01)
-    assert_equal(1, methods[0].called)
-
-    assert_equal('<Class::RubyProf::C1>#hello', methods[1].full_name)
-    assert_in_delta(0.1, methods[1].total_time, 0.01)
-    assert_in_delta(0, methods[1].wait_time, 0.01)
-    assert_in_delta(0, methods[1].self_time, 0.01)
-    assert_equal(1, methods[1].called)
-
-    assert_equal('Kernel#sleep', methods[2].full_name)
-    assert_in_delta(0.1, methods[2].total_time, 0.01)
-    assert_in_delta(0, methods[2].wait_time, 0.01)
-    assert_in_delta(0.1, methods[2].self_time, 0.01)
-    assert_equal(1, methods[2].called)
-  end
-end
-
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class CallInfoTest < 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_clone
+#    result = RubyProf.profile do
+#      RubyProf::C1.hello
+#    end
+#
+#    method = result.threads.first.top_methods.first
+#    call_info = method.call_infos.first
+#    call_info_clone = call_info.clone
+#
+##    assert_equal(call_info.target, call_info_clone.target)
+#    assert_equal(call_info.total_time, call_info_clone.total_time)
+#  end
+
+  def test_merge
+    result1 = RubyProf.profile do
+      RubyProf::C1.hello
+    end
+
+    methods = result1.threads.first.methods.sort.reverse
+    assert_equal(3, methods.length)
+
+    assert_equal('CallInfoTest#test_merge', methods[0].full_name)
+    assert_in_delta(0.1, methods[0].total_time, 0.01)
+    assert_in_delta(0, methods[0].wait_time, 0.01)
+    assert_in_delta(0, methods[0].self_time, 0.01)
+    assert_equal(1, methods[0].called)
+
+    assert_equal('<Class::RubyProf::C1>#hello', methods[1].full_name)
+    assert_in_delta(0.1, methods[1].total_time, 0.01)
+    assert_in_delta(0, methods[1].wait_time, 0.01)
+    assert_in_delta(0, methods[1].self_time, 0.01)
+    assert_equal(1, methods[1].called)
+
+    assert_equal('Kernel#sleep', methods[2].full_name)
+    assert_in_delta(0.1, methods[2].total_time, 0.01)
+    assert_in_delta(0, methods[2].wait_time, 0.01)
+    assert_in_delta(0.1, methods[2].self_time, 0.01)
+    assert_equal(1, methods[2].called)
+
+    RubyProf.profile do
+      RubyProf::C1.hello
+    end
+
+    # Merge the trees
+    methods = result1.threads.first.methods.sort.reverse
+    assert_equal(3, methods.length)
+
+    assert_equal('CallInfoTest#test_merge', methods[0].full_name)
+    assert_in_delta(0.1, methods[0].total_time, 0.01)
+    assert_in_delta(0, methods[0].wait_time, 0.01)
+    assert_in_delta(0, methods[0].self_time, 0.01)
+    assert_equal(1, methods[0].called)
+
+    assert_equal('<Class::RubyProf::C1>#hello', methods[1].full_name)
+    assert_in_delta(0.1, methods[1].total_time, 0.01)
+    assert_in_delta(0, methods[1].wait_time, 0.01)
+    assert_in_delta(0, methods[1].self_time, 0.01)
+    assert_equal(1, methods[1].called)
+
+    assert_equal('Kernel#sleep', methods[2].full_name)
+    assert_in_delta(0.1, methods[2].total_time, 0.01)
+    assert_in_delta(0, methods[2].wait_time, 0.01)
+    assert_in_delta(0.1, methods[2].self_time, 0.01)
+    assert_equal(1, methods[2].called)
+  end
+end
+