stackprof 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba362f7b8c12e89a30cc376280443aef51ce7ac6
-  data.tar.gz: 561f31e9f8b90a728dec5c9d6090f4bd7701228a
+  metadata.gz: a10d79a11e17b11b5b706c69c9c5b5546b7fabe9
+  data.tar.gz: 41e9454828e293709c63bb96ecff91530f2fb8da
 SHA512:
-  metadata.gz: 85a79f6edbf81e520b90d4f35d615c475297acdfe7b5db4277b93bc1e342ac8cc2aebdd56990bca1e82258020f270d6c28bd2098df27f90f320c005da07e9cae
-  data.tar.gz: 7d17bca5d3f356f63d1eec962e40dd4e50520e4a7b2c602b748f94779a9fb147566cc4439ff3cc0c619a687e4eff6e2da5a997240f1542e09849802a4ee7e09a
+  metadata.gz: 0e3d5900059d2531409bba444a58679e50227d656ab450d5fc04bc8a8fcec9d0055224599369cab3304dbd8366c06957af06978b12f28cb359d8f83455c409ca
+  data.tar.gz: 34c673bbe0c60795d7b97a39d2ab1bace18a6377dfd7c5f63dca31fc2c2e0447e8c420e5663e9b7c61cd11365d5cd4c2e2bc6d0f23f8b414ddb3c7083b82867a

data/Gemfile.lock

@@ -1,11 +1,14 @@
 PATH
   remote: .
   specs:
-    stackprof (0.2.0)
+    stackprof (0.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    metaclass (0.0.1)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
     rake (10.1.0)
     rake-compiler (0.9.1)
       rake
@@ -14,5 +17,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  mocha
   rake-compiler
   stackprof!

data/bin/stackprof

@@ -11,15 +11,15 @@ options = {
 parser = OptionParser.new(ARGV) do |o|
   o.banner = "Usage: stackprof [file.dump]+ [--text|--method=NAME|--callgrind|--graphviz]"
 
-  o.on('--text', 'Text summary (default)'){ options[:format] = :text }
-  o.on('--method [grep]', 'Zoom into specified method'){ |f| options[:format] = :method; options[:filter] = f }
+  o.on('--text', 'Text summary per method (default)'){ options[:format] = :text }
   o.on('--files', 'List of files'){ |f| options[:format] = :files }
-  o.on('--file [grep]', 'Show annotated code for specified file'){ |f| options[:format] = :file; options[:filter] = f }
+  o.on('--limit=[num]', Integer, 'Limit --text or --files output to N lines'){ |n| options[:limit] = n }
+  o.on('--sort-total', "Sort --text or --files output on total samples\n\n"){ options[:sort] = true }
+  o.on('--method=[grep]', 'Zoom into specified method'){ |f| options[:format] = :method; options[:filter] = f }
+  o.on('--file=[grep]', 'Show annotated code for specified file'){ |f| options[:format] = :file; options[:filter] = f }
   o.on('--callgrind', 'Callgrind output (use with kcachegrind, gprof2dot)'){ options[:format] = :callgrind }
-  o.on('--graphviz', 'Graphviz output (use with dot)'){ options[:format] = :graphviz }
-  o.on('--debug'){ options[:format] = :debug }
-  o.on('--limit [num]', Integer, 'Limit --text output to N lines'){ |n| options[:limit] = n }
-  o.on('--sort-total', 'Sort --text output on total samples'){ options[:sort] = true }
+  o.on('--graphviz', "Graphviz output (use with dot)\n\n"){ options[:format] = :graphviz }
+  o.on('--debug', 'Pretty print raw profile data'){ options[:format] = :debug }
 end
 
 parser.parse!

data/lib/stackprof/middleware.rb

@@ -3,12 +3,14 @@ require 'fileutils'
 module StackProf
   class Middleware
     def initialize(app, options = {})
-      @app = app
-      @options = options
-      @num_reqs = options[:save_every] || nil
-      Middleware.mode = options[:mode] || :cpu
+      @app       = app
+      @options   = options
+      @num_reqs  = options[:save_every] || nil
+
+      Middleware.mode     = options[:mode] || :cpu
       Middleware.interval = options[:interval] || 1000
-      Middleware.enabled = options[:enabled]
+      Middleware.enabled  = options[:enabled]
+      Middleware.path     = options[:path] || 'tmp'
       at_exit{ Middleware.save? } if options[:save_at_exit]
     end
 
@@ -26,17 +28,19 @@ module StackProf
     end
 
     class << self
-      attr_accessor :enabled, :mode, :interval
+      attr_accessor :enabled, :mode, :interval, :path
       alias enabled? enabled
 
       def save
         if results = StackProf.results
-          FileUtils.mkdir_p('tmp')
-          File.open("tmp/stackprof-#{results[:mode]}-#{Process.pid}-#{Time.now.to_i}.dump", 'wb') do |f|
+          FileUtils.mkdir_p(Middleware.path)
+          filename = "stackprof-#{results[:mode]}-#{Process.pid}-#{Time.now.to_i}.dump"
+          File.open(File.join(Middleware.path, filename), 'wb') do |f| 
             f.write Marshal.dump(results)
           end
         end
       end
+
     end
   end
 end

data/lib/stackprof/report.rb

@@ -92,11 +92,11 @@ module StackProf
         fontsize = (1.0 * call / max_samples) * 28 + 10
         size = (1.0 * total / overall_samples) * 2.0 + 0.5
 
-        f.puts "  #{frame} [size=#{size}] [fontsize=#{fontsize}] [penwidth=\"#{size}\"] [shape=box] [label=\"#{info[:name]}\\n#{sample}\"];"
+        f.puts "  \"#{frame}\" [size=#{size}] [fontsize=#{fontsize}] [penwidth=\"#{size}\"] [shape=box] [label=\"#{info[:name]}\\n#{sample}\"];"
         if edges = info[:edges]
           edges.each do |edge, weight|
             size = (1.0 * weight / overall_samples) * 2.0 + 0.5
-            f.puts "  #{frame} -> #{edge} [label=\"#{weight}\"] [weight=\"#{weight}\"] [penwidth=\"#{size}\"];"
+            f.puts "  \"#{frame}\" -> \"#{edge}\" [label=\"#{weight}\"] [weight=\"#{weight}\"] [penwidth=\"#{size}\"];"
           end
         end
       end
@@ -171,7 +171,7 @@ module StackProf
 
         if callees = info[:edges]
           f.printf "  callees (%d total):\n", info[:total_samples]-info[:samples]
-          callees = callees.map{ |k, weight| [data[:frames][k][:name], weight] }
+          callees = callees.map{ |k, weight| [data[:frames][k][:name], weight] }.sort_by{ |k,v| -v }
           callees.each do |name, weight|
             f.printf "   % 5d  (% 8s)  %s\n", weight, "%3.1f%%" % (100.0*weight/(info[:total_samples]-info[:samples])), name
           end
@@ -188,7 +188,7 @@ module StackProf
       list = list.first(limit) if limit
       list.each do |file, vals|
         total_samples, samples = *vals
-        f.printf "% 5d  (%2.1f%%) / % 5d  (%2.1f%%) %s\n", total_samples, (100.0*total_samples/overall_samples), samples, (100.0*samples/overall_samples), file
+        f.printf "% 5d  (%5.1f%%) / % 5d  (%5.1f%%)   %s\n", total_samples, (100.0*total_samples/overall_samples), samples, (100.0*samples/overall_samples), file
       end
     end
 

data/stackprof.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'stackprof'
-  s.version = '0.2.1'
+  s.version = '0.2.2'
   s.homepage = 'http://github.com/tmm1/stackprof'
 
   s.authors = 'Aman Gupta'
@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.add_development_dependency 'rake-compiler'
+  s.add_development_dependency 'mocha'
 end

data/test/test_middleware.rb

@@ -0,0 +1,41 @@
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'stackprof'
+require 'stackprof/middleware'
+require 'test/unit'
+require 'mocha/setup'
+
+class StackProf::MiddlewareTest < Test::Unit::TestCase
+
+  def test_path_default
+    StackProf::Middleware.new(Object.new)
+
+    assert_equal 'tmp', StackProf::Middleware.path
+  end
+
+  def test_path_custom
+    StackProf::Middleware.new(Object.new, { path: '/foo' })
+
+    assert_equal '/foo', StackProf::Middleware.path
+  end
+
+  def test_save_default
+    StackProf::Middleware.new(Object.new)
+
+    StackProf.stubs(:results).returns({ mode: 'foo' })
+    FileUtils.expects(:mkdir_p).with('tmp')
+    File.expects(:open).with(regexp_matches(/^tmp\/stackprof-foo/), 'wb')
+
+    StackProf::Middleware.save
+  end
+
+  def test_save_custom
+    StackProf::Middleware.new(Object.new, { path: '/foo' })
+
+    StackProf.stubs(:results).returns({ mode: 'foo' })
+    FileUtils.expects(:mkdir_p).with('/foo')
+    File.expects(:open).with(regexp_matches(/^\/foo\/stackprof-foo/), 'wb')
+
+    StackProf::Middleware.save
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackprof
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: stackprof is a fast sampling profiler for ruby code, with cpu, wallclock
   and object allocation samplers.
 email: aman@tmm1.net
@@ -45,6 +59,7 @@ files:
 - lib/stackprof/report.rb
 - sample.rb
 - stackprof.gemspec
+- test/test_middleware.rb
 - test/test_stackprof.rb
 homepage: http://github.com/tmm1/stackprof
 licenses: