ruby-prof 0.10.2 → 0.10.4

data/CHANGES

@@ -1,3 +1,11 @@
+0.10.4
+=======================
+Faster load time for ruby-prof itself.
+
+0.10.3
+=======================
+Can cleanly load before rubygems now.
+
 0.10.2
 =======================
 Fix for 1.9.2, os x for latest commits (thanks skaes!)

data/README.rdoc

@@ -29,11 +29,11 @@ The easiest way to install ruby-prof is by using Ruby Gems.  To install:
   gem install ruby-prof
 
 If you on windows mswin [not mingw] (check via ruby -v) and
-don't have an MSVC compiler, please install v0.7.3 which
+don't have an MSVC compiler, please install v0.8.1 which
 has a prebuilt binary
 C:> gem install ruby-prof -v0.8.1
 
-If you're on mingw, please install the devkit first, then install the latest gem version (gem install ruby-prof).
+If you're on mingw, please install the devkit first, then install the latest gem version (via gem install ruby-prof).
 
 == Usage
 
@@ -120,19 +120,6 @@ This will start profiling immediately at that point and will output the results
 using a flat profile report after the process ends.
 
 
-== Benchmarking full load time ==
-
-If you want to get a more accurate measurement of what takes a gem's bin/xxx
-command its time to load, you may want to also measure rubygems' startup penalty.
-You can do this by calling into bin/ruby-prof directly, ex:
-
-
-$ ruby C:/installs/Ruby187/lib/ruby/gems/1.8/gems/ruby-prof-0.10.0/bin/ruby-prof D:\Ruby192\bin\ruby-prof
-
-or
-
-$ ruby C:/installs/Ruby187/lib/ruby/gems/1.8/gems/ruby-prof-0.10.0/bin/ruby-prof some_file_that_does_a_require_rubygems_at_the_beginning
-
 == Method Elimination
 
 Starting with release 0.9.0, ruby-prof supports eliminating methods from profiling
@@ -155,6 +142,22 @@ the name of a file containing a list of regular expressions (line separated text
 After eliminating methods the resulting profile will appear exactly as if those methods
 had been inlined at their call sites.
 
+== Benchmarking full load time including rubygems startup cost ==
+
+If you want to get a more accurate measurement of what takes all of a gem's bin/xxx
+command to load, you may want to also measure rubygems' startup penalty.
+You can do this by calling into bin/ruby-prof directly, ex:
+
+$ gem which ruby-prof
+  g:/192/lib/ruby/gems/1.9.1/gems/ruby-prof-0.10.2/lib/ruby-prof.rb
+
+now run it thus (substitute lib/ruby-prof.rb with bin/ruby-prof):
+
+$ ruby g:/192/lib/ruby/gems/1.9.1/gems/ruby-prof-0.10.2/bin/ruby-prof g:\192\bin\some_installed_gem_command
+
+or
+
+$ ruby g:/192/lib/ruby/gems/1.9.1/gems/ruby-prof-0.10.2/bin/ruby-prof ./some_file_that_does_a_require_rubygems_at_the_beginning.rb
 
 == Profiling Tests
 
@@ -450,4 +453,4 @@ See LICENSE for license information.
 
 Code is located at http://github.com/rdp/ruby-prof
 
-Google group/mailing list: http://groups.google.com/group/ruby-prof
+Google group/mailing list: http://groups.google.com/group/ruby-prof

data/Rakefile

@@ -4,8 +4,7 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 require 'date'
 
-
-# to release it, do a git tag, then rake cleanr default and publish that
+# to release a version of ruby-prof, do a git tag, then rake cleanr default and publish that
 # git tag 0.10.1
 # git push origin 0.10.1
 # rake cleanr default
@@ -13,8 +12,9 @@ require 'date'
 
 default_spec = eval File.read(File.expand_path('../ruby-prof.gemspec', __FILE__))
 
-desc 'build native .gem files -- use like "native_gems clobber cross native gem"--for non native gem creation use "native_gems clobber" then "clean gem"'
+desc 'deprecated--build native .gem files -- use like "native_gems clobber cross native gem"--for non native gem creation use "native_gems clobber" then "clean gem"'
 task :native_gems do
+  # we don't do cross compiler anymore, now that mingw has devkit
   ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
   require 'rake/extensiontask'
   Rake::ExtensionTask.new('ruby_prof', default_spec) do |ext|
@@ -71,7 +71,7 @@ task :build do
     system(Gem.ruby + " extconf.rb")
     system("make clean")
   end
-  system("make")
+  raise 'make failed' unless system("make")
   FileUtils.cp 'ruby_prof.so', '../../lib' if File.exist? 'lib/ruby_prof.so'
   FileUtils.cp 'ruby_prof.bundle', '../../lib' if File.exist? 'lib/ruby_prof.bundle'
  end

data/ext/ruby_prof/version.h

@@ -1,4 +1,4 @@
-#define RUBY_PROF_VERSION  "0.10.2" // for easy parsing from rake files
+#define RUBY_PROF_VERSION  "0.10.4" // for easy parsing from rake files
 #define RUBY_PROF_VERSION_MAJ   0
 #define RUBY_PROF_VERSION_MIN   10
-#define RUBY_PROF_VERSION_MIC   2
+#define RUBY_PROF_VERSION_MIC   4

data/lib/ruby-prof.rb

@@ -1,24 +1,35 @@
-# require the .so (ext) file...
-
-me = File.dirname(__FILE__) + '/'
-begin
-  # fat binaries
-  require "#{me}/#{RUBY_VERSION[0..2]}/ruby_prof"
-rescue Exception
-  require "#{me}/../ext/ruby_prof/ruby_prof"
-end
-
-# have to load them by hand since we don't want to load 'unprof'
-
-for file in ['abstract_printer', 'result', 'method_info', 'call_info', 'aggregate_call_info', 'flat_printer', 'flat_printer_with_line_numbers', 
- 'graph_printer', 'graph_html_printer', 'call_tree_printer', 'call_stack_printer', 'multi_printer', 'dot_printer', 'symbol_to_proc', # for 1.8's backward compatible benefit
- 'rack']
-
- require File.dirname(__FILE__) + '/ruby-prof/' + file
-end
+# require the .so file...
+require  File.dirname(__FILE__) + "/../ext/ruby_prof/ruby_prof"
 
 module RubyProf
-  # See if the user specified the clock mode via
+  
+  if RUBY_VERSION < '1.8.7'
+    require File.dirname(__FILE__) + '/ruby-prof/symbol_to_proc'
+  end
+  
+  def self.camelcase(phrase)
+    ('_' + phrase).gsub(/_([a-z])/){|b| b[1..1].upcase}
+  end
+  
+  lib_dir = File.dirname(__FILE__) + '/ruby-prof/'
+  
+  for file in ['abstract_printer', 'aggregate_call_info', 'flat_printer', 'flat_printer_with_line_numbers', 
+    'graph_printer', 'graph_html_printer', 'call_tree_printer', 'call_stack_printer', 'multi_printer', 'dot_printer']
+    autoload camelcase(file), lib_dir + file
+  end
+
+  # A few need to be loaded manually their classes were already defined by the .so file so autoload won't work for them.
+  # plus we need them anyway
+  for name in ['result', 'method_info', 'call_info']
+    require lib_dir + name
+  end
+  
+  require File.dirname(__FILE__) + '/ruby-prof/rack' # do we even need to load this every time?
+  
+  # we don't require unprof.rb, as well, purposefully
+  
+  
+  # Checks if the user specified the clock mode via
   # the RUBY_PROF_MEASURE_MODE environment variable
   def self.figure_measure_mode
     case ENV["RUBY_PROF_MEASURE_MODE"]

data/lib/ruby-prof/rack.rb

@@ -1,4 +1,3 @@
-require 'tmpdir'
 
 module Rack
   class RubyProf
@@ -16,6 +15,7 @@ module Rack
     end
 
     def print(data)
+      require 'tmpdir' # late require so we load on demand only
       printers = {::RubyProf::FlatPrinter => ::File.join(Dir.tmpdir, 'profile.txt'),
                   ::RubyProf::GraphHtmlPrinter => ::File.join(Dir.tmpdir, 'profile.html')}
 

data/test/printers_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require 'ruby-prof'
-require 'prime'
+require File.dirname(__FILE__) + '/prime'
 require 'stringio'
 require 'fileutils'
 require 'rubygems'
@@ -90,18 +90,12 @@ class PrintersTest < Test::Unit::TestCase
     assert_match(/called from/, output)
 
     # should combine common parents
-    # lodo remove...
-    #if RUBY_VERSION < '1.9'
-    #require 'ruby-debug'
-    #debugger
-    #print output
-      assert_equal(3, output.scan(/Object#is_prime/).length) # failing this is prolly a 1.9.2 core bug
-    #else
-    #  # 1.9
-    #  require 'ruby-debug'
-    #  debugger
-    #  assert_equal(2, output.scan(/Object#is_prime/).length)
-    #end
+    if RUBY_VERSION < '1.9'
+      assert_equal(3, output.scan(/Object#is_prime/).length)
+    else
+      # 1.9 inlines it's  Fixnum#- so we don't see as many
+      assert_equal(2, output.scan(/Object#is_prime/).length)
+    end
     assert_no_match(/\.\/test\/prime.rb/, output) # don't use relative paths
   end
 

data/test/stack_printer_test.rb

@@ -46,7 +46,7 @@ class StackPrinterTest < Test::Unit::TestCase
     assert file_contents =~ /Thread: (\d+) \(100\.00% ~ ([.0-9]+)\)/
     actual_time = $2.to_f
     difference = (expected_time-actual_time).abs
-    assert difference<0.001 # less than 1 ms
+    assert difference < 0.01 # less than 1 ms
   end
 
   def test_method_elimination

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 4
+  version: 0.10.4
 platform: ruby
 authors: 
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -06:00
+date: 2011-04-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-prof
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Fast Ruby profiler