rack-mini-profiler 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88d14211a1bd6e204377a0405f364fa9069029f0
-  data.tar.gz: 0c96e6d8d1df58cdd879319063e203efa846bd9f
+  metadata.gz: 50a96f45043bb94f118971de9fe539a5af648d9c
+  data.tar.gz: 2deba7160023f7ae64ec39bdc456bcaf2c77fb45
 SHA512:
-  metadata.gz: f681b1fe0dedcbd7ec6dc43f31cc0eb6d7dd78c0c69ae0b6bd040df166450a833a7f987c7d0167f2e54b30c37323bc99f48440078ad59052b852567a4d6ff442
-  data.tar.gz: dccb1eec80365ab26fd439d280ccc03fe3f0c9c72d193df117c1392b8f338abb4fbb72f676217c5ae5cd47bfb66a8249b4f7a6e244dcf1df7cd322bbff36c2d1
+  metadata.gz: 4444d3a819342722b3e27d8de3d9cbf9687fa3d54f9d9f39214ccb405b05973cc68950687227f3ea7caa4d994f0d6f757b4f34122c24a95689f9563b97e844a2
+  data.tar.gz: 2a9bdaf1850ca648c2569994f680874ce79bd5351553ce4d1c802119923ac375cddf4ba9d67812a2d4db1e06562af5672a9318aff678a84eef5896a3897b3907

data/Ruby/CHANGELOG

@@ -154,3 +154,8 @@
   * Feature: Added Rack::MiniProfiler.counter_method(klass,name) for injecting counters
   * Bug: Counters were not shifting the table correctly
 
+3-September-2013
+
+  * Ripped out flamegraph so it can be isolated into a gem
+  * Flamegraph now has much increased fidelity
+  * Ripped out pp=sample it just was never really used

data/Ruby/lib/mini_profiler/context.rb

@@ -1,6 +1,6 @@
 class Rack::MiniProfiler::Context
   attr_accessor :inject_js,:current_timer,:page_struct,:skip_backtrace,:full_backtrace,:discard, :mpt_init, :measure
-  
+
   def initialize(opts = {})
     opts["measure"] = true unless opts.key? "measure"
     opts.each do |k,v|

data/Ruby/lib/mini_profiler/gc_profiler_ruby_head.rb

@@ -0,0 +1,40 @@
+require 'objspace'
+
+class Rack::MiniProfiler::GCProfilerRubyHead
+  def profile_rack(app,env)
+  end
+
+  def profile(&block)
+    GC.start
+    GC.disable
+
+    items = []
+    objs = []
+
+    ObjectSpace.trace_object_allocations do
+      block.call
+
+      ObjectSpace.each_object do |o|
+        objs << o
+      end
+
+      objs.each do |o|
+        g = ObjectSpace.allocation_generation(o)
+        if g
+          l = ObjectSpace.allocation_sourceline(o)
+          f = ObjectSpace.allocation_sourcefile(o)
+          c = ObjectSpace.allocation_class_path(o)
+          m = ObjectSpace.allocation_method_id(o)
+          items << "Allocated #{c} in #{m} #{f}:#{l}"
+        end
+      end
+    end
+
+    items.group_by{|x| x}.sort{|a,b| b[1].length <=> a[1].length}.each do |row, group|
+      puts "#{row} x #{group.length}"
+    end
+
+    GC.enable
+    profile_allocations(name, &block)
+  end
+end

data/Ruby/lib/mini_profiler/profiler.rb

@@ -18,7 +18,8 @@ require 'mini_profiler/profiling_methods'
 require 'mini_profiler/context'
 require 'mini_profiler/client_settings'
 require 'mini_profiler/gc_profiler'
-require 'mini_profiler/flame_graph'
+# TODO
+# require 'mini_profiler/gc_profiler_ruby_head' if Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION)
 
 module Rack
 
@@ -237,35 +238,7 @@ module Rack
         current.skip_backtrace = true
       end
 
-      done_sampling = false
-      quit_sampler = false
-      backtraces = nil
-
-      if query_string =~ /pp=sample/ || query_string =~ /pp=flamegraph/
-        current.measure = false
-        skip_frames = 0
-        backtraces = []
-        t = Thread.current
-
-        Thread.new {
-          # new in Ruby 2.0
-          has_backtrace_locations = t.respond_to?(:backtrace_locations)
-          begin
-            i = 10000 # for sanity never grab more than 10k samples
-            while i > 0
-              break if done_sampling
-              i -= 1
-              backtraces << (has_backtrace_locations ? t.backtrace_locations : t.backtrace)
-
-              # On my machine using Ruby 2.0 this give me excellent fidelity of stack trace per 1.2ms
-              #   with this fidelity analysis becomes very powerful
-              sleep 0.0005
-            end
-          ensure
-            quit_sampler = true
-          end
-        }
-      end
+      flamegraph = nil
 
       trace_exceptions = query_string =~ /pp=trace-exceptions/ && defined? TracePoint
       status, headers, body, exceptions,trace = nil
@@ -287,15 +260,26 @@ module Rack
         env['HTTP_IF_MODIFIED_SINCE'] = ''
         env['HTTP_IF_NONE_MATCH'] = ''
 
-        status,headers,body = @app.call(env)
+        if query_string =~ /pp=flamegraph/
+          unless defined?(Flamegraph) && Flamegraph.respond_to?(:generate)
+
+            flamegraph = "Please install the flamegraph gem and require it: add gem 'flamegraph' to your Gemfile"
+            status,headers,body = @app.call(env)
+          else
+            # do not sully our profile with mini profiler timings
+            current.measure = false
+            # first param is the path
+            # 0.5 means attempt to collect a sample each 0.5 secs
+            flamegraph = Flamegraph.generate(nil, fidelity: 0.5) do
+              status,headers,body = @app.call(env)
+            end
+          end
+        else
+          status,headers,body = @app.call(env)
+        end
         client_settings.write!(headers)
       ensure
         trace.disable if trace
-
-        if backtraces
-          done_sampling = true
-          sleep 0.001 until quit_sampler
-        end
       end
 
       skip_it = current.discard
@@ -331,13 +315,9 @@ module Rack
       page_struct['User'] = user(env)
       page_struct['Root'].record_time((Time.now - start) * 1000)
 
-      if backtraces
+      if flamegraph
         body.close if body.respond_to? :close
-        if query_string =~ /pp=sample/
-          return analyze(backtraces, page_struct)
-        else
-          return flame_graph(backtraces, page_struct)
-        end
+        return self.flamegraph(flamegraph)
       end
 
 
@@ -471,12 +451,11 @@ module Rack
   pp=no-backtrace #{"(*) " if client_settings.backtrace_none?}: don't collect stack traces from all the SQL executed (sticky, use pp=normal-backtrace to enable)
   pp=normal-backtrace #{"(*) " if client_settings.backtrace_default?}: collect stack traces from all the SQL executed and filter normally
   pp=full-backtrace #{"(*) " if client_settings.backtrace_full?}: enable full backtraces for SQL executed (use pp=normal-backtrace to disable)
-  pp=sample : sample stack traces and return a report isolating heavy usage (works best on Ruby 2.0)
   pp=disable : disable profiling for this session
   pp=enable : enable profiling for this session (if previously disabled)
   pp=profile-gc: perform gc profiling on this request, analyzes ObjectSpace generated by request (ruby 1.9.3 only)
   pp=profile-gc-time: perform built-in gc profiling on this request (ruby 1.9.3 only)
-  pp=flamegraph: works best on Ruby 2.0, a graph representing sampled activity.
+  pp=flamegraph: works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem).
   pp=trace-exceptions: requires Ruby 2.0, will return all the spots where your application raises execptions
 "
 
@@ -484,49 +463,9 @@ module Rack
       [200, headers, [body]]
     end
 
-    def flame_graph(traces, page_struct)
-      graph = FlameGraph.new(traces)
-      data = graph.graph_data
-
+    def flamegraph(graph)
       headers = {'Content-Type' => 'text/html'}
-
-      body = IO.read(::File.expand_path('../html/flamegraph.html', ::File.dirname(__FILE__)))
-      body.gsub!("/*DATA*/", ::JSON.generate(data));
-
-      [200, headers, [body]]
-    end
-
-    def analyze(traces, page_struct)
-      headers = {'Content-Type' => 'text/plain'}
-      body = "Collected: #{traces.count} stack traces. Duration(ms): #{page_struct.duration_ms}"
-
-      seen = {}
-      fulldump = ""
-      traces.each do |trace|
-        fulldump << "\n\n"
-        distinct = {}
-        trace.each do |frame|
-          frame = frame.to_s unless String === frame
-          unless distinct[frame]
-            distinct[frame] = true
-            seen[frame] ||= 0
-            seen[frame] += 1
-          end
-          fulldump << frame << "\n"
-        end
-      end
-
-      body << "\n\nStack Trace Analysis\n"
-      seen.to_a.sort{|x,y| y[1] <=> x[1]}.each do |name, count|
-        if count > traces.count / 10
-          body << "#{name} x #{count}\n"
-        end
-      end
-
-      body << "\n\n\nRaw traces \n"
-      body << fulldump
-
-      [200, headers, [body]]
+      [200, headers, [graph]]
     end
 
     def ids_json(env)

data/Ruby/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '94950211d89e89a9694bc493497ab05f'.freeze
+    VERSION = '55905d0d15f4dc1e14b29260abce19b2'.freeze
   end
 end

data/rack-mini-profiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.30"
+	s.version = "0.1.31"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Sam Saffron", "Robin Ward","Aleks Totic"]
 	s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -89,7 +89,6 @@ files:
 - Ruby/lib/html/includes.js
 - Ruby/lib/html/list.js
 - Ruby/lib/html/jquery.1.7.1.js
-- Ruby/lib/html/flamegraph.html
 - Ruby/lib/html/includes.css
 - Ruby/lib/mini_profiler/context.rb
 - Ruby/lib/mini_profiler/page_timer_struct.rb
@@ -103,13 +102,13 @@ files:
 - Ruby/lib/mini_profiler/gc_profiler.rb
 - Ruby/lib/mini_profiler/client_timer_struct.rb
 - Ruby/lib/mini_profiler/sql_timer_struct.rb
+- Ruby/lib/mini_profiler/gc_profiler_ruby_head.rb
 - Ruby/lib/mini_profiler/config.rb
 - Ruby/lib/mini_profiler/custom_timer_struct.rb
 - Ruby/lib/mini_profiler/version.rb
 - Ruby/lib/mini_profiler/timer_struct.rb
 - Ruby/lib/mini_profiler/profiler.rb
 - Ruby/lib/mini_profiler/request_timer_struct.rb
-- Ruby/lib/mini_profiler/flame_graph.rb
 - Ruby/lib/patches/net_patches.rb
 - Ruby/lib/patches/sql_patches.rb
 - Ruby/lib/rack-mini-profiler.rb

data/Ruby/lib/html/flamegraph.html

@@ -1,351 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.0.8/d3.min.js"></script>
-<!-- <script src="http://cdnjs.cloudflare.com/ajax/libs/sugar/1.3.8/sugar.min.js"></script> -->
-<meta charset=utf-8 />
-<title>Flame Graph of Page</title>
-<style>
-  .info {height: 40px;}
-  .legend div {
-    display: block;
-    float: left;
-    width: 150px;
-    margin: 0 8px 8px;
-    padding: 4px;
-    height: 50px;
-  }
-</style>
-</head>
-<body>
-  <div class="graph"></div>
-  <div class="info"></div>
-  <div class="legend"></div>
-  
-  <script>
-
-var data = /*DATA*/;
-var maxX = 0;
-var maxY = 0;
-
-debounce = function(func, wait, trickle) {
-  var timeout;
-
-  timeout = null;
-  return function() {
-    var args, context, currentWait, later;
-    context = this;
-    args = arguments;
-    later = function() {
-      timeout = null;
-      return func.apply(context, args);
-    };
-
-    if (timeout && trickle) {
-      // already queued, let it through
-      return;
-    }
-
-    if (typeof wait === "function") {
-      currentWait = wait();
-    } else {
-      currentWait = wait;
-    }
-
-    if (timeout) {
-      clearTimeout(timeout);
-    }
-
-    timeout = setTimeout(later, currentWait);
-    return timeout;
-  };
-};
-
-
-var guessGem = function(frame)
-{
-  var split = frame.split('/gems/'); 
-  if(split.length == 1) {
-    split = frame.split('/app/');
-    if(split.length == 1) {
-      split = frame.split('/lib/');
-    }
-
-    split = split[Math.max(split.length-2,0)].split('/');
-    return split[split.length-1];
-  }
-  else 
-  {
-    return split[split.length -1].split('/')[0];
-  }
-}
-
-var guessMethod = function(frame) {
-  var split = frame.split('`');
-  if(split.length == 2) {
-    return split[1].split("'")[0];
-  }
-  return '?';
-}
-
-var guessFile = function(frame) {
-  var split = frame.split(".rb:");
-  if(split.length == 2) {
-    split = split[0].split('/');
-    return split[split.length - 1];
-  }
-  return "";
-}
-
-$.each(data, function(){
-   maxX = Math.max(maxX, this.x + this.width);
-   maxY = Math.max(maxY, this.y);
-   this.shortName = /* guessGem(this.frame) + " " + guessFile(this.frame) + " "  */ guessMethod(this.frame);
-});
-
-var width = $(window).width();
-var height = $(window).height() / 1.2;
-
-$('.graph').width(width).height(height);
-
-var xScale = d3.scale.linear()
-	.domain([0, maxX])
-    .range([0, width]);
-
-var yScale = d3.scale.linear()
-    .domain([0, maxY])
-    .range([0,height]);
-
-var realHeight = 0;
-var debouncedHeightCheck = debounce(function(){
-  if (realHeight > 15) {
-    svg.selectAll('text').attr('display','show');
-  } else {
-    svg.selectAll('text').attr('display','none');
-  }
-}, 200);
-
-function zoom() 
-{
-  svg.attr("transform", "translate(" + d3.event.translate + ")" + " scale(" + d3.event.scale + ")"); 
-
-  realHeight = yScale(1) * d3.event.scale;
-  debouncedHeightCheck();
-}    
-
-var svg = d3.select(".graph")
-                    .append("svg")
-                    .attr("width", "100%")
-                    .attr("height", "100%")
-                    .attr("pointer-events", "all")
-                    .append('svg:g')
-                    .call(d3.behavior.zoom().on("zoom", zoom))
-                    .append('svg:g');
-
-
-// so zoom works everywhere
-svg.append("rect")
-    .attr("x",function(d) { return xScale(0); })
-    .attr("y",function(d) { return yScale(0);})
-    .attr("width", function(d){return xScale(maxX);})
-    .attr("height", yScale(maxY))
-    .attr("fill", "white");
-
-var color = function() {
-  var r = parseInt(205 + Math.random() * 50);
-  var g = parseInt(Math.random() * 230);
-  var b = parseInt(Math.random() * 55);
-  return "rgb(" + r + "," + g + "," + b + ")";
-}
-var info = {}; 
-
-// http://stackoverflow.com/questions/1960473/unique-values-in-an-array 
-Array.prototype.getUnique = function() {
-    var o = {}, a = []
-    for (var i = 0; i < this.length; i++) o[this[i]] = 1
-    for (var e in o) a.push(e)
-    return a
-}
-
-var samplePercent = function(samples, exclusive){
-  var info = " (" + samples + 
-    " sample" + (samples == 1 ? "" : "s") + " - " + 
-    ((samples / maxX) * 100).toFixed(2) + "%) ";
-  if (exclusive) {
-    info += " (" + exclusive + 
-      " exclusive - " +
-    ((exclusive / maxX) * 100).toFixed(2) + "%) ";
-  }
-  return info;
-}
-
-var mouseover =  function(d) {
-  var i = info[d.frame];
-  $('.info').text( d.frame + " " + samplePercent(i.samples.length, d.topFrame ? d.topFrame.exclusiveCount : 0));
-  d3.selectAll(i.nodes)
-     .attr('opacity',0.5);
-};
-
-var mouseout = function(d) {
-  var i = info[d.frame];
-  $('.info').text("");
-  d3.selectAll(i.nodes)
-     .attr('opacity',1);
-};
-
-// http://stackoverflow.com/a/7419630
-var rainbow = function(numOfSteps, step) {
-    // This function generates vibrant, "evenly spaced" colours (i.e. no clustering). This is ideal for creating easily distiguishable vibrant markers in Google Maps and other apps.
-    // Adam Cole, 2011-Sept-14
-    // HSV to RBG adapted from: http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
-    var r, g, b;
-    var h = step / numOfSteps;
-    var i = ~~(h * 6);
-    var f = h * 6 - i;
-    var q = 1 - f;
-    switch(i % 6){
-        case 0: r = 1, g = f, b = 0; break;
-        case 1: r = q, g = 1, b = 0; break;
-        case 2: r = 0, g = 1, b = f; break;
-        case 3: r = 0, g = q, b = 1; break;
-        case 4: r = f, g = 0, b = 1; break;
-        case 5: r = 1, g = 0, b = q; break;
-    }
-    var c = "#" + ("00" + (~ ~(r * 255)).toString(16)).slice(-2) + ("00" + (~ ~(g * 255)).toString(16)).slice(-2) + ("00" + (~ ~(b * 255)).toString(16)).slice(-2);
-    return (c);
-}
-
-// assign some colors, analyze samples per gem 
-var gemStats = {} 
-var topFrames = {}
-var lastFrame = {frame: 'd52e04d-df28-41ed-a215-b6ec840a8ea5', x: -1}
-
-$.each(data, function(){
-
-  var gem = guessGem(this.frame);
-  var stat = gemStats[gem];
-
-  if(!stat) {
-    gemStats[gem] = stat = {samples: [], frames: []};
-  }
-
-  stat.frames.push(this.frame);
-  for(var j=0; j < this.width; j++){
-    stat.samples.push(this.x + j);
-  }
-  // This assumes the traversal is in order
-  if (lastFrame.x != this.x) {
-    var topFrame = topFrames[lastFrame.frame]
-    if (!topFrame) {
-      topFrames[lastFrame.frame] = topFrame = {exclusiveCount: 0}
-    }
-    topFrame.exclusiveCount += 1;
-    lastFrame.topFrame = topFrame;
-  }
-  lastFrame = this;
-  
-});
-
-var topFrame = topFrames[lastFrame.frame]
-if (!topFrame) {
-  topFrames[lastFrame.frame] = topFrame = {exclusiveCount: 0}
-}
-topFrame.exclusiveCount += 1;
-lastFrame.topFrame = topFrame;
-
-var totalGems = 0;
-$.each(gemStats, function(){totalGems++;});
-
-
-var currentIndex = 0;
-$.each(gemStats, function(k,stat){
-
-  stat.color = rainbow(totalGems, currentIndex);
-  stat.samples = stat.samples.getUnique();
-
-  for(var x=0; x < stat.frames.length; x++) {
-    info[stat.frames[x]] = {nodes: [], samples: [], color: stat.color};
-  }
-
-  currentIndex += 1;
-});
-
-
-// see: http://bl.ocks.org/mundhradevang/1387786
-function fontSize(d,i) {
-  var size = yScale(1) / 3;
-  // var words = d.shortName.split(' ');
-  var word = d.shortName; // words[0];
-  var width = xScale(d.width+100);
-  var height = yScale(1);
-  var length = 0;
-  d3.select(this).style("font-size", size + "px").text(word);
-  while(((this.getBBox().width >= width) || (this.getBBox().height >= height)) && (size > 12))
-   {
-    size -= 0.1;
-    d3.select(this).style("font-size", size + "px");
-   }
-
-   d3.select(this).attr("dy", size);
-}
-
-svg.selectAll("g")
-	.data(data)
-	.enter()
-    .append("g")
-    .each(function(){
-      d3.select(this)
-      .append("rect")
-      .attr("x",function(d) { return xScale(d.x-1); })
-      .attr("y",function(d) { return yScale(maxY - d.y);})
-      .attr("width", function(d){return xScale(d.width);})
-      .attr("height", yScale(1))
-      .attr("fill", function(d){
-        var i = info[d.frame];
-        if(!i) {
-          info[d.frame] = i = {nodes: [], samples: [], color: color()};
-        }
-        i.nodes.push(this);
-        for(var j=0; j < d.width; j++){
-          i.samples.push(d.x + j);
-        }
-        return i.color;
-      })
-      .on("mouseover", mouseover)
-      .on("mouseout", mouseout);
-
-      d3.select(this)
-        .append("text")
-        .attr("x",function(d) { return xScale(d.x - 0.98); })
-        .attr("y",function(d) { return yScale(maxY - d.y);})
-        .on("mouseover", mouseover)
-        .on("mouseout", mouseout)
-        .each(fontSize)
-        .attr("display", "none");
-
-    });
-    
-
-// Samples may overlap on the same line
-for (var r in info) {
-  if (info[r].samples) {
-    info[r].samples = info[r].samples.getUnique();
-  }
-};
-
-
-// render the legend
-$.each(gemStats, function(k,v){
-  var node = $("<div></div>")
-    .css("background-color", v.color)
-    .text(k + " " + samplePercent(v.samples.length)) ;
-  $('.legend').append(node);
-});
-
-
-
-  </script>
-</body>
-</html>
-

data/Ruby/lib/mini_profiler/flame_graph.rb

@@ -1,54 +0,0 @@
-# inspired by https://github.com/brendangregg/FlameGraph
-
-class Rack::MiniProfiler::FlameGraph
-  def initialize(stacks)
-    @stacks = stacks
-  end
-
-  def graph_data
-    height = 0
-
-    table = []
-    prev = []
-
-    # a 2d array makes collapsing easy
-    @stacks.each_with_index do |stack, pos|
-      col = []
-
-      stack.reverse.map{|r| r.to_s}.each_with_index do |frame, i|
-
-        if !prev[i].nil?
-          last_col = prev[i]
-          if last_col[0] == frame
-            last_col[1] += 1
-            col << nil
-            next
-          end
-        end
-
-        prev[i] = [frame, 1]
-        col << prev[i]
-      end
-      prev = prev[0..col.length-1].to_a
-      table << col
-    end
-
-    data = []
-
-    # a 1d array makes rendering easy
-    table.each_with_index do |col, col_num|
-      col.each_with_index do |row, row_num|
-        next unless row && row.length == 2
-        data << {
-          :x => col_num + 1,
-          :y => row_num + 1,
-          :width => row[1],
-          :frame => row[0]
-        }
-      end
-    end
-
-    data
-  end
-
-end