stackprof 0.2.6 → 0.2.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackprof (0.2.5)
+    stackprof (0.2.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -7,6 +7,19 @@ and written as a replacement for [perftools.rb](https://github.com/tmm1/perftool
 
 ### getting started
 
+#### Install
+
+In your Gemfile add:
+
+```ruby
+gem 'stackprof'
+```
+
+Then run `$ bundle install`. Alternatively you can run `$ gem install stackprof`.
+
+
+#### Run
+
 in ruby:
 
 ``` ruby

data/Rakefile

@@ -4,7 +4,7 @@ task :default => :test
 # Packaging
 # ==========================================================
 
-GEMSPEC = eval(File.read('stackprof.gemspec'))
+GEMSPEC = Gem::Specification::load('stackprof.gemspec')
 
 require 'rubygems/package_task'
 Gem::PackageTask.new(GEMSPEC) do |pkg|

data/ext/stackprof.c

@@ -92,7 +92,7 @@ stackprof_start(int argc, VALUE *argv, VALUE self)
     if (mode == sym_object) {
 	if (!RTEST(interval)) interval = INT2FIX(1);
 
-	objtracer = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ, stackprof_newobj_handler, 0);
+	objtracer = rb_tracepoint_new(Qnil, RUBY_INTERNAL_EVENT_NEWOBJ, stackprof_newobj_handler, 0);
 	rb_tracepoint_enable(objtracer);
     } else if (mode == sym_wall || mode == sym_cpu) {
 	if (!RTEST(interval)) interval = INT2FIX(1000);

data/lib/stackprof/middleware.rb

@@ -11,14 +11,15 @@ module StackProf
       Middleware.interval = options[:interval] || 1000
       Middleware.enabled  = options[:enabled]
       Middleware.path     = options[:path] || 'tmp'
-      at_exit{ Middleware.save? } if options[:save_at_exit]
+      at_exit{ Middleware.save } if options[:save_at_exit]
     end
 
     def call(env)
-      StackProf.start(mode: Middleware.mode, interval: Middleware.interval) if Middleware.enabled?
+      enabled = Middleware.enabled?(env)
+      StackProf.start(mode: Middleware.mode, interval: Middleware.interval) if enabled
       @app.call(env)
     ensure
-      if Middleware.enabled?
+      if enabled
         StackProf.stop
         if @num_reqs && (@num_reqs-=1) == 0
           @num_reqs = @options[:save_every]
@@ -29,7 +30,14 @@ module StackProf
 
     class << self
       attr_accessor :enabled, :mode, :interval, :path
-      alias enabled? enabled
+
+      def enabled?(env)
+        if enabled.respond_to?(:call)
+          enabled.call(env)
+        else
+          enabled
+        end
+      end
 
       def save(filename = nil)
         if results = StackProf.results

data/lib/stackprof/report.rb

@@ -285,40 +285,6 @@ module StackProf
       end
     end
 
-    private
-
-    def root_frames
-      frames.select{ |addr, frame| callers_for(addr).size == 0  }
-    end
-
-    def callers_for(addr)
-      @callers_for ||= {}
-      @callers_for[addr] ||= data[:frames].map{ |id, other| [other[:name], other[:edges][addr]] if other[:edges] && other[:edges].include?(addr) }.compact
-    end
-
-    def source_display(f, file, lines, range=nil)
-      File.readlines(file).each_with_index do |code, i|
-        next unless range.nil? || range.include?(i)
-        if lines and lineinfo = lines[i+1]
-          total_samples, samples = lineinfo
-          if version == 1.0
-            samples = total_samples
-            f.printf "% 5d % 7s  | % 5d  | %s", samples, "(%2.1f%%)" % (100.0*samples/overall_samples), i+1, code
-          elsif samples > 0
-            f.printf "% 5d  % 8s / % 5d  % 7s  | % 5d  | %s", total_samples, "(%2.1f%%)" % (100.0*total_samples/overall_samples), samples, "(%2.1f%%)" % (100.0*samples/overall_samples), i+1, code
-          else
-            f.printf "% 5d  % 8s                   | % 5d  | %s", total_samples, "(%3.1f%%)" % (100.0*total_samples/overall_samples), i+1, code
-          end
-        else
-          if version == 1.0
-            f.printf "               | % 5d  | %s", i+1, code
-          else
-            f.printf "                                  | % 5d  | %s", i+1, code
-          end
-        end
-      end
-    end
-
     def +(other)
       raise ArgumentError, "cannot combine #{other.class}" unless self.class == other.class
       raise ArgumentError, "cannot combine #{modeline} with #{other.modeline}" unless modeline == other.modeline
@@ -364,5 +330,39 @@ module StackProf
 
       self.class.new(data)
     end
+
+    private
+    def root_frames
+      frames.select{ |addr, frame| callers_for(addr).size == 0  }
+    end
+
+    def callers_for(addr)
+      @callers_for ||= {}
+      @callers_for[addr] ||= data[:frames].map{ |id, other| [other[:name], other[:edges][addr]] if other[:edges] && other[:edges].include?(addr) }.compact
+    end
+
+    def source_display(f, file, lines, range=nil)
+      File.readlines(file).each_with_index do |code, i|
+        next unless range.nil? || range.include?(i)
+        if lines and lineinfo = lines[i+1]
+          total_samples, samples = lineinfo
+          if version == 1.0
+            samples = total_samples
+            f.printf "% 5d % 7s  | % 5d  | %s", samples, "(%2.1f%%)" % (100.0*samples/overall_samples), i+1, code
+          elsif samples > 0
+            f.printf "% 5d  % 8s / % 5d  % 7s  | % 5d  | %s", total_samples, "(%2.1f%%)" % (100.0*total_samples/overall_samples), samples, "(%2.1f%%)" % (100.0*samples/overall_samples), i+1, code
+          else
+            f.printf "% 5d  % 8s                   | % 5d  | %s", total_samples, "(%3.1f%%)" % (100.0*total_samples/overall_samples), i+1, code
+          end
+        else
+          if version == 1.0
+            f.printf "               | % 5d  | %s", i+1, code
+          else
+            f.printf "                                  | % 5d  | %s", i+1, code
+          end
+        end
+      end
+    end
+
   end
 end

data/stackprof.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'stackprof'
-  s.version = '0.2.6'
+  s.version = '0.2.7'
   s.homepage = 'http://github.com/tmm1/stackprof'
 
   s.authors = 'Aman Gupta'

data/test/test_middleware.rb

@@ -38,4 +38,26 @@ class StackProf::MiddlewareTest < Test::Unit::TestCase
     StackProf::Middleware.save
   end
 
+  def test_enabled_should_use_a_proc_if_passed
+    env = {}
+
+    StackProf::Middleware.new(Object.new, enabled: Proc.new{ false })
+    refute StackProf::Middleware.enabled?(env)
+
+    StackProf::Middleware.new(Object.new, enabled: Proc.new{ true })
+    assert StackProf::Middleware.enabled?(env)
+  end
+
+  def test_enabled_should_use_a_proc_if_passed_and_use_the_request_env
+    enable_proc = Proc.new {|env| env['PROFILE'] }
+
+    env = Hash.new { false }
+    StackProf::Middleware.new(Object.new, enabled: enable_proc)
+    refute StackProf::Middleware.enabled?(env)
+
+    env = Hash.new { true}
+    StackProf::Middleware.new(Object.new, enabled: enable_proc)
+    assert StackProf::Middleware.enabled?(env)
+  end
+
 end

metadata

@@ -1,41 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: stackprof
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
+  prerelease: 
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.14'
 description: stackprof is a fast sampling profiler for ruby code, with cpu, wallclock
@@ -49,7 +54,7 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -74,26 +79,27 @@ files:
 homepage: http://github.com/tmm1/stackprof
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: sampling callstack-profiler for ruby 2.1+
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e783faab7c8c97296d52c602c971eddb3e4c85eb
-  data.tar.gz: 4952c5aec78540e9a2509e37f6e2195f56568712
-SHA512:
-  metadata.gz: 3a0f36b8202aefb65836dbe71b359fbcea3f7ecf4252fce52ec127f47db0ea9995f177f808c631d6803f5b40e1697d2e065028a15ceb17387351b2d3fa7af0e7
-  data.tar.gz: 685c58d929c5681693c64a1a63e939382171420ecc83856cabc9efeb2d0f7e65c25802d6f0c5c47e0b6def8addda2f0b78985048c7829f6b23e7ccb636be79ff