ruby-prof 0.11.0.rc2 → 0.11.0.rc3

data/ext/ruby_prof/vc/ruby_prof.vcxproj

@@ -39,7 +39,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>C:\MinGW\local\src\ruby-prof\lib\1.9</OutDir>
+    <OutDir>..\..\..\lib\1.9</OutDir>
     <TargetExt>.so</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

data/lib/ruby-prof.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+
+# Load the C-based binding.
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/ruby_prof"
+rescue LoadError
+  require "ruby_prof"
+end
+
+require 'ruby-prof/aggregate_call_info'
+require 'ruby-prof/call_info'
+require 'ruby-prof/call_info_visitor'
+require 'ruby-prof/compatibility'
+require 'ruby-prof/method_info'
+require 'ruby-prof/profile'
+require 'ruby-prof/rack'
+
+require 'ruby-prof/printers/abstract_printer'
+require 'ruby-prof/printers/call_info_printer'
+require 'ruby-prof/printers/call_stack_printer'
+require 'ruby-prof/printers/call_tree_printer'
+require 'ruby-prof/printers/dot_printer'
+require 'ruby-prof/printers/flat_printer'
+require 'ruby-prof/printers/flat_printer_with_line_numbers'
+require 'ruby-prof/printers/graph_html_printer'
+require 'ruby-prof/printers/graph_printer'
+require 'ruby-prof/printers/multi_printer'
+
+module RubyProf
+  # 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"]
+    when "wall" || "wall_time"
+      RubyProf.measure_mode = RubyProf::WALL_TIME
+    when "cpu" || "cpu_time"
+      if ENV.key?("RUBY_PROF_CPU_FREQUENCY")
+        RubyProf.cpu_frequency = ENV["RUBY_PROF_CPU_FREQUENCY"].to_f
+      else
+        begin
+          open("/proc/cpuinfo") do |f|
+            f.each_line do |line|
+              s = line.slice(/cpu MHz\s*:\s*(.*)/, 1)
+              if s
+                RubyProf.cpu_frequency = s.to_f * 1000000
+                break
+              end
+            end
+          end
+        rescue Errno::ENOENT
+        end
+      end
+      RubyProf.measure_mode = RubyProf::CPU_TIME
+    when "allocations"
+      RubyProf.measure_mode = RubyProf::ALLOCATIONS
+    when "memory"
+      RubyProf.measure_mode = RubyProf::MEMORY
+    else
+      # the default...
+      RubyProf.measure_mode = RubyProf::PROCESS_TIME
+    end
+  end
+end
+
+RubyProf::figure_measure_mode

data/lib/ruby-prof/rack.rb

@@ -8,24 +8,36 @@ module Rack
       @options = options
       @options[:min_percent] ||= 1
       @tmpdir = options[:path] || Dir.tmpdir
-      @printer_klasses = {::RubyProf::FlatPrinter => 'flat.txt',
-                          ::RubyProf::GraphPrinter => 'graph.txt',
-                          ::RubyProf::GraphHtmlPrinter => 'graph.html',
-                          ::RubyProf::CallStackPrinter => 'call_stack.html'}
+      @printer_klasses = @options[:printers]  || {::RubyProf::FlatPrinter => 'flat.txt',
+                                                  ::RubyProf::GraphPrinter => 'graph.txt',
+                                                  ::RubyProf::GraphHtmlPrinter => 'graph.html',
+                                                  ::RubyProf::CallStackPrinter => 'call_stack.html'}
+
+      @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}]
     end
 
     def call(env)
-      result = nil
-      data = ::RubyProf::Profile.profile do
-        result = @app.call(env)
-      end
-
       request = Rack::Request.new(env)
-      path = request.path.gsub('/', '-')
-      path.slice!(0)
 
-      print(data, path)
-      result
+      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)

data/lib/unprof.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+require "ruby-prof"
+
+at_exit {
+  result = RubyProf.stop
+  printer = RubyProf::FlatPrinter.new(result)
+  printer.print(STDOUT)
+}
+RubyProf.start

data/ruby-prof.gemspec

@@ -7,7 +7,7 @@ match = version_header.match(/RUBY_PROF_VERSION\s*"([^"]+)"/)
 raise(RuntimeError, "Could not determine RUBY_PROF_VERSION") if not match
 
 # For now make this an rc1
-RUBY_PROF_VERSION = "#{match[1]}.rc2"
+RUBY_PROF_VERSION = "#{match[1]}.rc3"
 
 Gem::Specification.new do |spec|
   spec.name = "ruby-prof"
@@ -45,6 +45,8 @@ EOF
                    'ext/ruby_prof/*.h',
                    'ext/ruby_prof/vc/*.sln',
                    'ext/ruby_prof/vc/*.vcxproj',
+                   'lib/ruby-prof.rb',
+                   'lib/unprof.rb',
                    'lib/ruby-prof/*.rb',
                    'lib/ruby-prof/images/*.png',
                    'lib/ruby-prof/printers/*.rb',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 0.11.0.rc2
+  version: 0.11.0.rc3
   prerelease: 7
 platform: ruby
 authors:
@@ -90,6 +90,8 @@ files:
 - ext/ruby_prof/vc/ruby_prof.sln
 - ext/ruby_prof/vc/ruby_prof.vcxproj
 - ext/ruby_prof/vc/ruby_prof_18.vcxproj
+- lib/ruby-prof.rb
+- lib/unprof.rb
 - lib/ruby-prof/aggregate_call_info.rb
 - lib/ruby-prof/call_info.rb
 - lib/ruby-prof/call_info_visitor.rb