stackprofiler 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d49ea799e330d848bf167e2f5fbec763e136cc
-  data.tar.gz: 572be41c382be167f0b61bdca9aad96d44d55c30
+  metadata.gz: cef292287c198e673dec3311397b8a0f3124bdf5
+  data.tar.gz: cc122485fbbca1605e100a0ca5e80e45aa979273
 SHA512:
-  metadata.gz: 1ef14a9045d59fdfe64b6d5ad0e0a7e0d33cf641e2b01f2cf4557ba921b042156d752b0ce8e9e0b08140c320ab2e4ad58bf76f39a599bd57ff4fe1d867ffc848
-  data.tar.gz: c3ef5a43a3707f168b3026d6bd44763733824df9b533d0879c8f8daa04fbe512a52962f7d1793d7bcbb52fe5bf7889a21a40f680a7a560ce51a31d5cc3ded425
+  metadata.gz: e5dc5a401932e640d444d32bee79d2ef70a5f01bb017b014192e21fcab25db82e1b6877f3fd34918a3c01ee1b19684c1b228cf1bd4908df32a1a76d25e69b22e
+  data.tar.gz: 93f5d521e61ab24d5ac34ade6be06cc22a6497eacb977a361e1e8009b7ec8ad4b84dd861214592c364ec79d275babb125ebc01ab40f6d93ac8c74383780bae83

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stackprofiler.gemspec
 gemspec
+gem 'stackprofx', path: '/Users/aidan/dev/stackprofx'
+gem 'stackprofiler-middleware', path: '/Users/aidan/dev/stackprofiler-middleware'

data/README.md

@@ -23,86 +23,61 @@ rough edges :)
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'stackprofiler'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
     $ gem install stackprofiler
 
-## Middleware
+Stackprofiler is a stand-alone Ruby app that can be installed using Rubygems.
+The client gems (see below) should probably be installed as part of a Bundler
+Gemfile.
 
-Using Stackprofiler at this stage is pretty simple on account of there
-not yet being much flexibility in the way of configuration. This will be
-fixed later - hopefully the simplicity can remain.
+## Usage
 
-Once installed, add Stackprofiler's middleware somewhere in your Rack
-chain, e.g.:
+Once installed, the Stackprofiler web UI can be started from the terminal by
+running `stackprofiler`. By itself, it won't do much. It will wait for profile
+data to come in from client gems. There are a handful of these gems and they
+are listed below.
 
-    config.middleware.use Stackprofiler::Middleware
+## Other gems
 
-Now start your server like normal. If you wish to profile a request,
-append `profile=true` to the query string. This will inform Stackprofiler
-that it should do its thing. Take note that the response will remain
-unchanged - Stackprofiler will record its statistics for your later perusal
-elsewhere. This is to make it easier to profile requests that don't return
-visible results, e.g. XHR.
+### Rack Middleware
 
-Once you have profiled a request or two, you can head over to Stackprofiler's
-GUI. This is located on the same port as your website, albeit at the
-path `/__stackprofiler`. If your server is running on port 5000 in development,
-the link might be [`http://localhost:5000/__stackprofiler`](http://localhost:5000/__stackprofiler).
+Stackprofiler can be used to measure the performance of Ruby-powered websites
+by using a drop-in Rack middleware. This middleware is provided by a separate
+gem; [`stackprofiler-middleware`][3].
 
-You should now see a page that looks like the screenshot above. Click on any
-line in the stack trace to see the code for that method annotated with the
-performance characteristics for each line. I would document those here but
-they are going to change in the next few dev hours, so I'll come back to that
-later.
+The reason for a separate gem is so that Stackprofiler can be used in as many
+circumstances as possible. Your app may have dependencies that conflict with
+those powering the Stackprofiler web UI and it would be a shame to miss out
+on using this tool on account of that.
 
-### Data collection configuration
+Head on over to the README for that gem to learn how to use it.
 
-Stackprofiler's operation can be configured by passing in parameters to the
-middleware specified above. While the defaults should suit most applications,
-changing them is easy enough:
-
-```ruby
-config.middleware.use Stackprofiler::Middleware {
-  predicate: /profile=true/, # regex form for urls to be profiled
-  predicate: proc {|env| true }, # callable form for greater flexibility than regex
-  stackprof: { # options to be passed directly through to stackprof, e.g.:
-    interval: 1000 # sample every n micro-seconds
-  }
-}
-```
-
-## Ad hoc
+### Pry Plugin
 
 Sometimes you want to test some code that isn't part of a Rack app - or is
 just cumbersome to run outside of an IRB console. You can test this code
-directly using code very similar to the `stackprof` interface. It works like
-this:
+directly very easily using the [`pry-stackprofiler`][4] gem in the [Pry][5]
+REPL.
 
-Run `$ stackprofiler` from the command line. This will start a Stackprofiler
-server that will listen for incoming profile runs and display them on
-[`http://localhost:9292/__stackprofiler`](http://localhost:9292/__stackprofiler).
-Next, in an IRB console (or, even better, [Pry][3]!)
+Pry is an alternative to IRB with handy support for plugins. `pry-stackprofiler`
+is such a plugin and works well with the Stackprofiler server. Once installed,
+you can type code into the REPL like:
 
 ```ruby
-require 'stackprofiler'
-
-Stackprofiler.profile do
-  SomeSlowTaskThatNeedsInvestigation.run
+Pry.profile do
+  sleep 0.3
+  sleep 0.4
+  sleep 0.1
 end
 ```
 
-Now visit the above URL and a visual breakdown of the code flow will be visible.
+And the profile results will appear in the Stackprofiler web UI. For running
+instructions, refer to the gem's README.
+
+### Sidekiq Middleware
+
+Stackprofiler can also be used to measure the performance of background jobs
+powered by [Sidekiq][6]. It does this using the [`stackprofiler-sidekiq`][7] middleware
+gem. Have a look at the README for that gem to learn more.
 
 ## Contributing
 
@@ -118,4 +93,8 @@ So much. First todo: write a todo list.
 
 [1]: https://github.com/tmm1/stackprof
 [2]: https://github.com/ruby-prof/ruby-prof
-[3]: https://github.com/pry/pry
+[3]: https://github.com/glassechidna/stackprofiler-middleware
+[4]: https://github.com/glassechidna/pry-stackprofiler
+[5]: https://github.com/pry/pry
+[6]: https://github.com/mperham/sidekiq
+[7]: https://github.com/glassechidna/stackprofiler-sidekiq

data/bin/stackprofiler

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 require 'stackprofiler'
 
-app = Rack::URLMap.new '/__stackprofiler' => Stackprofiler::WebUI.new
-Rack::Server.start app: app, Port: 9292
+app = Rack::URLMap.new '/' => Stackprofiler::WebUI.new
+Rack::Server.start app: app, Port: 9260

data/config.ru

@@ -1,5 +1,7 @@
 require 'stackprofiler'
+require 'stackprofiler/middleware'
 
-run Rack::URLMap.new '/__stackprofiler' => Stackprofiler::WebUI.new(file: '/Users/aidan/dev/better-data/yy.json')
-# run Rack::URLMap.new '/__stackprofiler' => Stackprofiler::WebUI.new
+use Stackprofiler::Middleware, ui_url: 'http://localhost:9260/receive', predicate: /json/
+# run Stackprofiler::WebUI.new file: 'portal.json'
+run Stackprofiler::WebUI.new file: 'threads.json'
 

data/lib/stackprofiler/filters/build_tree.rb

@@ -5,20 +5,20 @@ module Stackprofiler
         @options = options
       end
 
-      def filter run, frames
+      def filter run, run2
         stacks = run.stacks
 
-        root_addr = stacks[0][0].to_s
-        root = Tree::TreeNode.new root_addr, {addrs: [root_addr]}
+        root = StandardWarning.disable { Tree::TreeNode.new '(Root)', {addrs: [], open: true} }
+        all = {root_addr: root}
 
         stacks.each do |stack|
           prev = root
-          iterate stack do |addr|
-            addr = addr.to_s
-            node = prev[addr]
+          iterate stack[1..-1] do |addr|
+            node = all[addr]
             if node.nil?
               hash = {count: 0, addrs: [addr]}
-              node = Tree::TreeNode.new(addr, hash)
+              node = StandardWarning.disable { Tree::TreeNode.new(addr, hash) }
+              all[addr] = node
               prev << node
             end
             node.content[:count] +=1

data/lib/stackprofiler/filters/compress_tree.rb

@@ -5,7 +5,7 @@ module Stackprofiler
 
       end
 
-      def filter root, frames
+      def filter root, run
         root.reverse_depth_first do |node|
           if node.out_degree == 1
             hash = node.content

data/lib/stackprofiler/filters/frame_regex_removal.rb

@@ -12,8 +12,8 @@ module Stackprofiler
         @regexes ||= ary.reject(&:blank?).map {|r| /#{r}/ }.compact
       end
 
-      def filter root, frames
-        remove_frames root, frames do |node, frame|
+      def filter root, run
+        remove_frames root, run do |node, frame|
           regexes.any? {|r| frame[:name] =~ r }
         end
       end

data/lib/stackprofiler/filters/gem_removal.rb

@@ -6,8 +6,8 @@ module Stackprofiler
       def initialize(options={})
       end
 
-      def filter root, frames
-        remove_frames root, frames do |node, frame|
+      def filter root, run
+        remove_frames root, run do |node, frame|
           Gem.path.any? {|p| frame[:file].include?(p) }
         end
       end

data/lib/stackprofiler/filters/js_tree.rb

@@ -5,25 +5,26 @@ module Stackprofiler
 
       end
 
-      def filter root, frames
+      def filter root, run
         addrs = root.content[:addrs]
-        name = addrs.first.to_i
+        name = addrs.first
+        frames = run.profile[:frames]
         frame = frames[name]
 
         escaped = addrs.map do |addr|
-          this_frame = frames[addr.to_i]
+          this_frame = frames[addr]
           this_name = CGI::escapeHTML(this_frame[:name])
           "#{this_name} (<b>#{this_frame[:samples]}</b>)"
         end
-        text = escaped.join("<br> ↳ ")
+        text = escaped.join("<br> ↳ ").presence || root.name
 
         sorted_children = root.children.sort_by do |child|
-          addr = child.content[:addrs].first.to_i
-          frame = frames[addr]
-          frame[:samples]
+          addr = child.content[:addrs].first
+          cframe = frames[addr]
+          cframe[:samples]
         end.reverse
 
-        children = sorted_children.map { |n| filter(n, frames) }
+        children = sorted_children.map { |n| filter(n, run) }
         open = root.content.has_key?(:open) ? root.content[:open] : frame[:total_samples] > 100
         {text: text, state: {opened: open}, children: children, icon: false, data: {addrs: addrs}}
       end

data/lib/stackprofiler/filters/quick_method_removal.rb

@@ -8,8 +8,8 @@ module Stackprofiler
         self.limit = options[:limit].try(:to_i) || 0
       end
 
-      def filter root, frames
-        remove_frames root, frames do |node, frame|
+      def filter root, run
+        remove_frames root, run do |node, frame|
           frame[:total_samples] < limit
         end
       end

data/lib/stackprofiler/filters/rebase_stack.rb

@@ -1,24 +1,28 @@
 module Stackprofiler
   module Filter
     class RebaseStack
-      attr_accessor :top_names
+      attr_accessor :manual
 
       def initialize(options={})
-        self.top_names = options[:name].presence || RebaseStack.default
+        self.manual = options[:name].presence
       end
 
-      def filter root, frames
+      def filter root, run
+        suggested = run.profile[:suggested_rebase]
+
         root.find do |node|
+          next if node == root
           addr = node.content[:addrs].first.to_i
-          top_names.include? frames[addr][:name]
-          # frames[addr][:name] == top_names
-        end || root
-      end
+          frame = run.profile[:frames][addr]
 
-      class << self
-        def default
-          ['Stackprofiler::DataCollector#call', 'block in Stackprofiler#profile']
-        end
+          if manual
+            frame[:name].include? manual
+          elsif suggested.is_a? String
+            suggested == frame[:name]
+          else
+            suggested == addr
+          end
+        end || root
       end
     end
   end

data/lib/stackprofiler/run_code_cache.rb

@@ -0,0 +1,21 @@
+module Stackprofiler
+  class RunCodeCache
+    extend MethodSource::CodeHelpers
+
+    def initialize profile
+      @profile = profile
+    end
+
+    def source_helper(source_location, name=nil)
+      file, line = *source_location
+      file_cache = @profile[:files] || []
+
+      if file_cache.include? file
+        file_data = @profile[:files][file]
+        self.class.expression_at(file_data, line)
+      else
+        MethodSource::source_helper(source_location, name)
+      end
+    end
+  end
+end

data/lib/stackprofiler/run_data_source.rb

@@ -10,7 +10,11 @@ module Stackprofiler
       @timestamp = timestamp
     end
 
-    def stacks
+    def code_cache
+      @code_cache ||= RunCodeCache.new @profile
+    end
+
+    def stacks use_weights=false
       @stacks ||= begin
         off = 0
         stacks = []
@@ -18,9 +22,11 @@ module Stackprofiler
         while off < raw.length
           len = raw[off]
           these_frames = raw[off + 1..off + len]
+          weight = raw[off + len + 1]
           off += len + 2
 
-          stacks.push these_frames
+          times = use_weights ? weight : 1
+          times.times { stacks.push these_frames }
         end
         stacks
       end
@@ -32,10 +38,10 @@ module Stackprofiler
 
     def gem_breakdown
       bottom_frames = stacks.map &:last
-      paths = bottom_frames.map {|addr| profile[:frames][addr][:file] }
+      frames = bottom_frames.map {|addr| profile[:frames][addr] }
 
-      gems = paths.map do |p|
-        case p
+      gems = frames.map do |frame|
+        case frame[:file]
           when %r{gems/(\D\w+)}
             $1
           when %r{#{RbConfig::CONFIG['rubylibdir']}}

data/lib/stackprofiler/utils.rb

@@ -15,23 +15,11 @@ module Tree
 end
 
 module Stackprofiler
-  def profile
-    # todo: pass through options perhaps?
-    profile = StackProf.run(mode: :wall, raw: true) { yield }
-    # todo: remove terrible hard-coded url
-    url = URI::parse 'http://localhost:9292/__stackprofiler/receive'
-    headers = {'Content-Type' => 'application/json'}
-    req = Net::HTTP::Post.new(url.to_s, headers)
-    req.body = Oj.dump profile
-    response = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
-  end
-  module_function :profile
-
   module Filter
     module RemoveFramesHelper
-      def remove_frames root, frames
+      def remove_frames root, run
         root.reverse_depth_first do |node|
-          frame = frames[node.name.to_i]
+          frame = run.profile[:frames][node.name]
 
           if yield node, frame
             parent = node.parent

data/lib/stackprofiler/web_ui/public/js/stackprofiler.js

@@ -16,7 +16,7 @@ $(function() {
     });
 
     $('#rebase_stack').autocomplete({
-        source: "/__stackprofiler/frame_names?run_id=" + $tree.data('runId'),
+        source: "/frame_names?run_id=" + $tree.data('runId'),
         minLength: 2
     });
 
@@ -39,7 +39,7 @@ $(function() {
     };
 
     var getNodes = function(node, cb) {
-        $.post("/__stackprofiler/json", JSON.stringify(getParams()), function(data, status, xhr) {
+        $.post("/json", JSON.stringify(getParams()), function(data, status, xhr) {
             cb.call(this, data);
         });
     };
@@ -54,7 +54,7 @@ $(function() {
         if (!data.node) return;
 
         var addrs = data.node.data.addrs;
-        var url = "/__stackprofiler/code/" + addrs[0] + "?run_id=" + $tree.data('runId');
+        var url = "/code/" + addrs[0] + "?run_id=" + $tree.data('runId');
         $("#source-display").load(url);
     });
 
@@ -62,30 +62,31 @@ $(function() {
         $tree.jstree().refresh();
     });
 
-    $.getJSON('/__stackprofiler/gem_breakdown?run_id=' + $tree.data('runId'), function(data, status, xhr) {
-        var threshold = 0.1;
+    $.getJSON('/gem_breakdown?run_id=' + $tree.data('runId'), function(data, status, xhr) {
+        var objs = _(data).map(function(count, gem) {
+            return {label: gem, value: count};
+        }).sortBy('value').reverse().value();
 
-        var sum = _.reduce(data, function(memo, count, gem) {
-            return memo + count;
-        }, 0);
+        var summer = function(memo, item) {
+            return memo + item.value;
+        };
 
-        var reduced = _(data).reduce(function(memo, count, gem) {
-            var key = count/sum > threshold ? gem : '(other)';
-            var accum = memo[key] || 0;
-            memo[key] = accum + count;
-            return memo;
-        }, {});
+        var sum = _.reduce(objs, summer, 0);
 
-        var f = function(count, gem) {
-            return {label: gem, value: count};
+        var threshold = 0.1;
+        var thresholder = function(item) {
+            return item.value/sum > threshold;
         };
 
-        var ary = _.map(data, f);
-        var graph_data = _.map(reduced, f);
+        var below_threshold = _.reject(objs, thresholder);
+        var other_count = _.reduce(below_threshold, summer, 0);
+
+        var graph_data = _.filter(objs, thresholder);
+        graph_data.push({label: '(other)', value: other_count});
 
         var colors = d3.scale.category10().range();
 
-        var rows = _(ary).zip(colors).first(ary.length).map(function(item) {
+        var rows = _(objs).zip(colors).first(objs.length).map(function(item) {
             var gem = item[0];
             var percent = (gem.value / sum * 100).toFixed(1);
             var has_color = gem.value/sum > threshold;

data/lib/stackprofiler/web_ui/views/index.erb

@@ -3,7 +3,7 @@
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">Profiles <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <% @runs.each_with_index do |run, run_id| %>
-        <li><a href="/__stackprofiler/?run_id=<%= run_id %>"><%= run.url %></a>&nbsp;(<b><%= run.duration %>s</b>)</li>
+        <li><a href="/?run_id=<%= run_id %>"><%= run.url %></a>&nbsp;(<b><%= run.duration %>s</b>)</li>
       <% end %>
     </ul>
   </li>
@@ -13,7 +13,7 @@
 <% end %>
 
 <% content_for :head do %>
-  <script src="/__stackprofiler/js/stackprofiler.js"></script>
+  <script src="/js/stackprofiler.js"></script>
 <% end %>
 
 <div id="foo">
@@ -84,7 +84,7 @@
                   <input type="checkbox" id="rebase_stack_enabled" name="rebase_stack_enabled" checked="true">
                   Enabled
                 </label>
-                <input type="text" class="form-control" disabled="true" id="rebase_stack" name="rebase_stack" placeholder="e.g. <%= Stackprofiler::Filter::RebaseStack.default.first %>">
+                <input type="text" class="form-control" disabled="true" id="rebase_stack" name="rebase_stack" placeholder="e.g. MyController#index">
                 <span class="help-block">Enter name of frame above which frames will be hidden.</span>
               </div>
             </div>

data/lib/stackprofiler/web_ui/views/layout.erb

@@ -1,22 +1,22 @@
 <html>
 <head>
-  <link rel="stylesheet" href="/__stackprofiler/vendor/css/bootstrap.min.css" />
-  <link rel="stylesheet" href="/__stackprofiler/vendor/css/splitter.css" />
-  <link rel="stylesheet" href="/__stackprofiler/vendor/jstree/themes/default/style.min.css" />
-  <link rel="stylesheet" href="/__stackprofiler/vendor/css/coderay.css" />
-  <link rel="stylesheet" href="/__stackprofiler/vendor/octicons/octicons.css" />
-  <link rel="stylesheet" href="/__stackprofiler/vendor/tokenfield/bootstrap-tokenfield.min.css" />
-  <link rel="stylesheet" href="/__stackprofiler/vendor/jquery-ui/jquery-ui.min.css" />
-  <link rel="stylesheet" href="/__stackprofiler/vendor/epoch/epoch.min.css" />
-  <script src="/__stackprofiler/vendor/js/jquery.min.js"></script>
-  <script src="/__stackprofiler/vendor/js/bootstrap.min.js"></script>
-  <script src="/__stackprofiler/vendor/jstree/jstree.js"></script>
-  <script src="/__stackprofiler/vendor/js/splitter.js"></script>
-  <script src="/__stackprofiler/vendor/tokenfield/bootstrap-tokenfield.min.js"></script>
-  <script src="/__stackprofiler/vendor/jquery-ui/jquery-ui.min.js"></script>
-  <script src="/__stackprofiler/vendor/d3/d3.min.js"></script>
-  <script src="/__stackprofiler/vendor/epoch/epoch.min.js"></script>
-  <script src="/__stackprofiler/vendor/lodash/lodash.min.js"></script>
+  <link rel="stylesheet" href="/vendor/css/bootstrap.min.css" />
+  <link rel="stylesheet" href="/vendor/css/splitter.css" />
+  <link rel="stylesheet" href="/vendor/jstree/themes/default/style.min.css" />
+  <link rel="stylesheet" href="/vendor/css/coderay.css" />
+  <link rel="stylesheet" href="/vendor/octicons/octicons.css" />
+  <link rel="stylesheet" href="/vendor/tokenfield/bootstrap-tokenfield.min.css" />
+  <link rel="stylesheet" href="/vendor/jquery-ui/jquery-ui.min.css" />
+  <link rel="stylesheet" href="/vendor/epoch/epoch.min.css" />
+  <script src="/vendor/js/jquery.min.js"></script>
+  <script src="/vendor/js/bootstrap.min.js"></script>
+  <script src="/vendor/jstree/jstree.js"></script>
+  <script src="/vendor/js/splitter.js"></script>
+  <script src="/vendor/tokenfield/bootstrap-tokenfield.min.js"></script>
+  <script src="/vendor/jquery-ui/jquery-ui.min.js"></script>
+  <script src="/vendor/d3/d3.min.js"></script>
+  <script src="/vendor/epoch/epoch.min.js"></script>
+  <script src="/vendor/lodash/lodash.min.js"></script>
   <%= yield_content :head %>
   <style>
     body, html {

data/lib/stackprofiler/web_ui.rb

@@ -1,5 +1,7 @@
 module Stackprofiler
   class WebUI < Sinatra::Base
+    use Rack::Deflater
+
     helpers Sinatra::ContentFor
     set :views, proc { File.join(root, 'web_ui', 'views') }
     set :public_folder, proc { File.join(root, 'web_ui', 'public') }
@@ -19,19 +21,9 @@ module Stackprofiler
     end
 
     configure :development do
-      # require 'better_errors'
-      # use BetterErrors::Middleware
-      # BetterErrors.application_root = __dir__
-    end
-
-    before do
-      puts "starting #{request.path}"
-      @start_req = Time.now
-    end
-
-    after do
-      duration = Time.now - @start_req
-      puts "finished #{request.path} (#{duration})"
+      require 'better_errors'
+      use BetterErrors::Middleware
+      BetterErrors.application_root = __dir__
     end
 
     get '/' do
@@ -48,6 +40,13 @@ module Stackprofiler
       end.to_json
     end
 
+    get '/dump' do
+      content_type 'application/json'
+      run_id = params[:run_id].to_i
+      run = RunDataSource.runs[run_id]
+      Oj.dump run
+    end
+
     get '/frames' do
       content_type 'application/json'
       run_id = params[:run_id].to_i
@@ -70,7 +69,7 @@ module Stackprofiler
       @file, @first_line = frame.values_at :file, :line
       @first_line ||= 1
 
-      @source = MethodSource::source_helper([@file, @first_line]).strip_heredoc
+      @source = run.code_cache.source_helper([@file, @first_line]).strip_heredoc
       @output = CodeRay.scan(@source, :ruby).div(wrap: nil).lines.map.with_index do |code, idx|
         line_index = idx + @first_line
         samples = frame[:lines][line_index] || []
@@ -85,18 +84,18 @@ module Stackprofiler
       run = RunDataSource.runs[run_id]
 
       content_type 'application/octet-stream'
-      Marshal.dump(run.profile)
-      # Oj.dump(run)
+      # Marshal.dump(run.profile)
+      Oj.dump(run)
     end
 
     get '/frame_names' do
-      name = params[:term]
+      name = params[:term].downcase
       run_id = params[:run_id].to_i
 
       run = RunDataSource.runs[run_id]
       frames = run.profile[:frames]
 
-      matching = frames.select {|addr, f| f[:name].include? name }
+      matching = frames.select {|addr, f| f[:name].downcase.include? name }
       results = matching.map {|addr, f| f[:name] }
 
       content_type 'application/json'
@@ -105,8 +104,9 @@ module Stackprofiler
 
     post '/receive' do
       data = request.body.read
-      json = Oj.load(data)
-      run = Run.new 'unknown', json, Time.now
+      json = Marshal.load(data)
+      name = json[:name] || 'unknown'
+      run = Run.new name, json, Time.now
       RunDataSource.runs << run
 
       # if they sent us a profile, they probably changed something and want that reflected
@@ -121,8 +121,11 @@ module Stackprofiler
       run_id = params[:run_id].to_i
       run = RunDataSource.runs[run_id]
 
+      breakdown = run.gem_breakdown
+      breakdown['(gc)'] = run.profile[:gc_samples]
+
       content_type 'application/json'
-      run.gem_breakdown.to_json
+      breakdown.to_json
     end
 
     post '/json' do
@@ -155,7 +158,7 @@ module Stackprofiler
         end
       end.compact
 
-      filtered = filters.reduce(run) {|memo, filter| filter.filter(memo, frames) }
+      filtered = filters.reduce(run) {|memo, filter| filter.filter(memo, run) }
 
       content_type 'application/json'
       Oj.dump(filtered, mode: :compat)

data/lib/stackprofiler.rb

@@ -2,18 +2,15 @@ require 'oj'
 require 'tree'
 require 'coderay'
 require 'objspace'
-require 'stackprof'
 require 'method_source'
 require 'sinatra/base'
 require 'active_support/all'
 require 'sinatra/content_for'
 require 'net/http'
 
-require 'stackprofiler/version'
 require 'stackprofiler/web_ui'
-require 'stackprofiler/middleware'
-require 'stackprofiler/data_collector'
 require 'stackprofiler/run_data_source'
+require 'stackprofiler/run_code_cache'
 require 'stackprofiler/utils'
 
 require 'stackprofiler/filters/js_tree'

data/stackprofiler.gemspec

@@ -1,11 +1,8 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'stackprofiler/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'stackprofiler'
-  spec.version       = Stackprofiler::VERSION
+  spec.version       = '0.0.3'
   spec.authors       = ['Aidan Steele']
   spec.email         = ['aidan.steele@glassechidna.com.au']
   spec.summary       = %q{Web UI wrapper for the awesome stackprof profiler.}
@@ -30,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-rescue'
   spec.add_development_dependency 'pry-stack_explorer'
 
-  spec.add_dependency 'stackprof'
   spec.add_dependency 'method_source'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'rubytree', '>= 0.9.5pre4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackprofiler
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Aidan Steele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: stackprof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +279,6 @@ files:
 - bin/stackprofiler
 - config.ru
 - lib/stackprofiler.rb
-- lib/stackprofiler/data_collector.rb
 - lib/stackprofiler/filters/build_tree.rb
 - lib/stackprofiler/filters/compress_tree.rb
 - lib/stackprofiler/filters/frame_regex_removal.rb
@@ -301,10 +286,9 @@ files:
 - lib/stackprofiler/filters/js_tree.rb
 - lib/stackprofiler/filters/quick_method_removal.rb
 - lib/stackprofiler/filters/rebase_stack.rb
-- lib/stackprofiler/middleware.rb
+- lib/stackprofiler/run_code_cache.rb
 - lib/stackprofiler/run_data_source.rb
 - lib/stackprofiler/utils.rb
-- lib/stackprofiler/version.rb
 - lib/stackprofiler/web_ui.rb
 - lib/stackprofiler/web_ui/public/js/stackprofiler.js
 - lib/stackprofiler/web_ui/public/vendor/css/bootstrap-theme.css

data/lib/stackprofiler/data_collector.rb

@@ -1,37 +0,0 @@
-module Stackprofiler
-  class DataCollector
-    def initialize(app, options)
-      @app = app
-
-      pred = options[:predicate] || /profile=true/
-      if pred.respond_to? :call
-        @predicate = pred
-      else
-        regex = Regexp.new pred
-
-        @predicate = proc do |env|
-          req = Rack::Request.new env
-          req.fullpath =~ regex
-        end
-      end
-
-      @stackprof_opts = {mode: :wall, interval: 1000, raw: true}.merge(options[:stackprof] || {})
-    end
-
-    def call(env)
-      if @predicate.call(env)
-        out = nil
-        profile = StackProf.run(@stackprof_opts) { out = @app.call env }
-
-        req = Rack::Request.new env
-        run = Run.new req.fullpath, profile, Time.now
-        RunDataSource.runs << run
-
-        out
-      else
-        @app.call env
-      end
-    end
-  end
-
-end

data/lib/stackprofiler/middleware.rb

@@ -1,18 +0,0 @@
-module Stackprofiler
-  class Middleware
-    def initialize(app, options = {})
-      mid = Rack::Builder.new do
-        use Rack::Deflater
-        run WebUI
-      end
-
-      @app = Rack::URLMap.new({'/__stackprofiler' => mid, '/' => DataCollector.new(app, options)})
-      @options = options
-    end
-
-    def call(env)
-      @app.call env
-    end
-  end
-end
-

data/lib/stackprofiler/version.rb

@@ -1,3 +0,0 @@
-module Stackprofiler
-  VERSION = '0.0.2'
-end