ruby-prof 0.12.2 → 0.13.0

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

@@ -28,6 +28,7 @@ module RubyProf
 
     def print_header(thread)
       @output << "Thread ID: %d\n" % thread.id
+      @output << "Fiber ID: %d\n" % thread.fiber_id unless thread.id == thread.fiber_id
       @output << "Total: %0.6f\n" % thread.total_time
       @output << "Sort by: #{sort_method}\n"
       @output << "\n"

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

@@ -60,7 +60,7 @@ module RubyProf
     end
 
     def method_href(thread, method)
-      h(method.full_name.gsub(/[><#\.\?=:]/,"_") + "_" + thread.id.to_s)
+      h(method.full_name.gsub(/[><#\.\?=:]/,"_") + "_" + thread.fiber_id.to_s)
     end
 
     def file_link(path, linenum)
@@ -139,11 +139,17 @@ 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>
-        <td><a href="#<%= thread.id %>"><%= thread.id %></a></td>
+        <% 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>
       <% end %>
@@ -153,8 +159,11 @@ module RubyProf
     <% for thread in @result.threads
          methods = thread.methods
          total_time = thread.total_time %>
-      <h2><a name="<%= thread.id %>">Thread <%= thread.id %></a></h2>
-
+      <% 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/printers/graph_printer.rb

@@ -22,6 +22,7 @@ module RubyProf
 
     def print_header(thread)
       @output << "Thread ID: #{thread.id}\n"
+      @output << "Fiber ID: #{thread.fiber_id}\n" unless thread.id == thread.fiber_id
       @output << "Total Time: #{thread.total_time}\n"
       @output << "Sort by: #{sort_method}\n"
       @output << "\n"
@@ -112,4 +113,4 @@ module RubyProf
       @output << "* indicates recursively called methods\n"
     end
   end
-end
+end

data/lib/ruby-prof/rack.rb

@@ -13,7 +13,7 @@ module Rack
                                                   ::RubyProf::GraphHtmlPrinter => 'graph.html',
                                                   ::RubyProf::CallStackPrinter => 'call_stack.html'}
 
-      @skip_paths = options[:skip_paths] || [%r{^/assets}, %r{\.css$}, %r{\.js}, %r{\.png}, %r{\.jpeg}]
+      @skip_paths = options[:skip_paths] || [%r{^/assets}, %r{\.css$}, %r{\.js$}, %r{\.png$}, %r{\.jpeg$}, %r{\.jpg$}, %r{\.gif$}]
     end
 
     def call(env)

data/ruby-prof.gemspec

@@ -53,7 +53,7 @@ EOF
 
   spec.test_files = Dir["test/test_*.rb"]
   spec.required_ruby_version = '>= 1.8.7'
-  spec.date = DateTime.now
+  spec.date = Time.now.strftime('%Y-%m-%d')
   spec.homepage = 'https://github.com/rdp/ruby-prof'
   spec.add_development_dependency('minitest')
   spec.add_development_dependency('rake-compiler')

data/test/fiber_test.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+require 'timeout'
+require 'set'
+begin
+  require 'fiber'
+rescue LoadError
+end
+
+# --  Tests ----
+class FiberTest < Test::Unit::TestCase
+
+  def fiber_test
+    @fiber_ids << Fiber.current.object_id
+    enum = Enumerator.new do |yielder|
+        [1,2].each do |x|
+          @fiber_ids << Fiber.current.object_id
+          sleep 0.1
+          yielder.yield x
+        end
+      end
+    while true
+      begin
+        x = enum.next
+      rescue StopIteration
+        break
+      end
+    end
+    sleep 0.1
+  end
+
+  def setup
+    # Need to use wall time for this test due to the sleep calls
+    RubyProf::measure_mode = RubyProf::WALL_TIME
+    @fiber_ids  = Set.new
+    @root_fiber = Fiber.current.object_id
+    @thread_id  = Thread.current.object_id
+    @result     = RubyProf.profile { fiber_test }
+  end
+
+  def test_fibers
+    profiled_fiber_ids = @result.threads.map(&:fiber_id)
+    assert_equal(2, @result.threads.length)
+    assert_equal([@thread_id], @result.threads.map(&:id).uniq)
+    assert_equal(@fiber_ids, Set.new(profiled_fiber_ids))
+
+    assert profiled_fiber_ids.include?(@root_fiber)
+    assert(root_fiber_profile = @result.threads.detect{|t| t.fiber_id == @root_fiber})
+    assert(enum_fiber_profile = @result.threads.detect{|t| t.fiber_id != @root_fiber})
+
+    assert_in_delta(0.3, root_fiber_profile.total_time, 0.01)
+    assert_in_delta(0.2, enum_fiber_profile.total_time, 0.01)
+
+    assert(method_next = root_fiber_profile.methods.detect{|m| m.full_name == "Enumerator#next"})
+    assert(method_each = enum_fiber_profile.methods.detect{|m| m.full_name == "Enumerator#each"})
+
+    assert_in_delta(0.2, method_next.total_time, 0.01)
+    assert_in_delta(0.2, method_each.total_time, 0.01)
+
+    # RubyProf::CallInfoPrinter.new(@result).print
+  end
+
+end if RUBY_VERSION >= "1.9"

data/test/measure_process_time_test.rb

@@ -42,12 +42,12 @@ class MeasureProcessTimeTest < Test::Unit::TestCase
 
     # Check times
     assert_equal("MeasureProcessTimeTest#test_primes", methods[0].full_name)
-    assert_in_delta(total_time, methods[0].total_time, 0.01)
+    assert_in_delta(total_time, methods[0].total_time, 0.02)
     assert_in_delta(0.0, methods[0].wait_time, 0.01)
     assert_in_delta(0.0, methods[0].self_time, 0.01)
 
     assert_equal("Object#run_primes", methods[1].full_name)
-    assert_in_delta(total_time, methods[1].total_time, 0.01)
+    assert_in_delta(total_time, methods[1].total_time, 0.02)
     assert_in_delta(0.0, methods[1].wait_time, 0.01)
     assert_in_delta(0.0, methods[1].self_time, 0.01)
 

data/test/multi_printer_test.rb

@@ -45,17 +45,19 @@ class MultiPrinterTest < Test::Unit::TestCase
 \s*<table>
 \s*<tr>
 \s*<th>Thread ID</th>
+\s*(<th>Fiber ID</th>)?
 \s*<th>Total Time</th>
 \s*</tr>
 \s*
 \s*<tr>
+\s*(<td>([\.0-9]+)</td>)?
 \s*<td><a href="#-?\d+">-?\d+</a></td>
-\s*<td>([\.0-9]+)</td>
+\s*<td>([\.0-9e]+)</td>
 \s*</tr>
 \s*
 \s*</table>')
     assert_match(re, graph)
-    display_time = $1.to_f
+    display_time = $4.to_f
     assert_in_delta expected_time, display_time, 0.5
   end
 

data/test/printers_test.rb

@@ -75,6 +75,7 @@ class PrintersTest < Test::Unit::TestCase
     printer.print(output)
 
     assert_match(/Thread ID: -?\d+/i, output)
+    assert_match(/Fiber ID: -?\d+/i, output) unless RUBY_VERSION =~ /^1.8/
     assert_match(/Total: \d+\.\d+/i, output)
     assert_match(/Object#run_primes/i, output)
     output
@@ -112,6 +113,7 @@ class PrintersTest < Test::Unit::TestCase
     printer.print(output)
 
     assert_match(/Thread ID: -?\d+/i, output)
+    assert_match(/Fiber ID: -?\d+/i, output) unless RUBY_VERSION =~ /^1.8/
     assert_match(/Total Time: \d+\.\d+/i, output)
     assert_match(/Object#run_primes/i, output)
   end

data/test/stack_printer_test.rb

@@ -43,8 +43,8 @@ class StackPrinterTest < Test::Unit::TestCase
     file_contents = nil
     assert_nothing_raised { file_contents = print(result) }
     # TODO: why are thread ids negative on travis-ci.org (32 bit build maybe?)
-    assert_match(/Thread: (-?\d+) \(100\.00% ~ ([\.0-9]+)\)/, file_contents)
-    actual_time = $2.to_f
+    assert_match(/Thread: (-?\d+)(, Fiber: (-?\d+))? \(100\.00% ~ ([\.0-9]+)\)/, file_contents)
+    actual_time = $4.to_f
     assert_in_delta(expected_time, actual_time, 0.5)
   end
 

data/test/test_helper.rb

@@ -13,6 +13,8 @@ if ENV["RM_INFO"] || ENV["TEAMCITY_VERSION"]
   MiniTest::Reporters.use!
 end
 
+require "minitest/pride"
+
 # To make testing/debugging easier, test within this source tree versus an installed gem
 dir = File.dirname(__FILE__)
 root = File.expand_path(File.join(dir, '..'))

metadata

@@ -1,71 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 0.12.2
   prerelease: 
+  version: 0.13.0
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  ruby-prof is a fast code profiler for Ruby. It is a C extension and
+    none: false
+  prerelease: false
+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, cfis@savagexi.com, rogerdpack@gmail.com, skaes@railsexpress.de
 executables:
 - ruby-prof
@@ -212,6 +218,7 @@ files:
 - test/exceptions_test.rb
 - test/exclude_threads_test.rb
 - test/exec_test.rb
+- test/fiber_test.rb
 - test/line_number_test.rb
 - test/measure_allocations_test.rb
 - test/measure_cpu_time_test.rb
@@ -243,20 +250,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -223596189223231347
+      hash: -3655921953818653003
+      version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25