stack_tracy 0.1.6 → 0.1.7

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = StackTracy CHANGELOG
 
+== Version 0.1.7 (August 30, 2012)
+
+* Added 'realtime' cumulatives tab within the stack tree HTML page ^^
+
 == Version 0.1.6 (August 28, 2012)
 
 * Always logging trace messages (despite of the :only and/or :exclude options)

data/README.md

@@ -384,7 +384,7 @@ Also, you can determine what StackTracy has to do after the request has finished
 
 This will immediately open the stack tree in your default browser after every traced request:
 
-    use StackTracy::Sinatra, :open do
+    use StackTracy::Sinatra, :open do |path, params|
       path == "/paul/engel" #=> only trace and open stack tree when opening "http://localhost:4567/paul/engel"
     end
 
@@ -399,7 +399,7 @@ The StackTracy repo is provided with `script/console` which you can use for deve
 Run the following command in your console:
 
     $ script/console
-    Loading development environment (StackTracy 0.1.6)
+    Loading development environment (StackTracy 0.1.7)
     [1] pry(main)> stack_tracy :print do
     [1] pry(main)*   puts "testing"
     [1] pry(main)* end

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/stack_tracy/version.rb

@@ -1,7 +1,7 @@
 module StackTracy #:nodoc:
   MAJOR = 0
   MINOR = 1
-  TINY  = 6
+  TINY  = 7
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/stack_tracy.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "stack_tracy"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.6"
+  gem.version       = "0.1.7"
 
   gem.add_dependency "rich_support", "~> 0.1.2"
   gem.add_dependency "launchy", "2.1.0"

data/ui/assets/stack_tracy.css

@@ -88,7 +88,8 @@ a {
   *display: inline;
   zoom: 1; }
 
-#page #cumulatives div span.count {
+#page #cumulatives div span.count,
+#page #realtime_cumulatives div span.count {
   width: 45px; }
 
 #footer {

data/ui/assets/stack_tracy.js

@@ -1,7 +1,7 @@
 if (typeof(StackTracy) == "undefined") {
 
 StackTracy = (function() {
-  var sortation = [];
+  var sortation = {cumulatives: [], realtime_cumulatives: []};
 
   var toggle = function(event) {
     var group = $(event.target).closest("div").next("div.group");
@@ -22,12 +22,12 @@ StackTracy = (function() {
   });
 
   return {
-    version: "0.1.6",
-    sort: function(column) {
-      sortation[column] = sortation[column] == "asc" ? "desc" : "asc";
-      $("#cumulatives>.body>div").tsort("span:eq(" + column + ")[abbr]", {
+    version: "0.1.7",
+    sort: function(section, column) {
+      sortation[section][column] = sortation[section][column] == "asc" ? "desc" : "asc";
+      $("#" + section + ">.body>div").tsort("span:eq(" + column + ")[abbr]", {
         sortFunction: function(a, b) {
-          var order = (sortation[column] == "asc") ? 1 : -1;
+          var order = (sortation[section][column] == "asc") ? 1 : -1;
           var av = column == 3 ? a.s : parseFloat(a.s);
           var bv = column == 3 ? b.s : parseFloat(b.s);
           if (av === bv) {

data/ui/index.html.erb

@@ -26,6 +26,9 @@
           <li>
             <a href="#cumulatives" data-toggle="tab">Cumulatives</a>
           </li>
+          <li>
+            <a href="#realtime_cumulatives" data-toggle="tab">Realtime cumulatives</a>
+          </li>
         </ul>
         <div class="tab-content"><%
           limited = events.size > limit
@@ -39,6 +42,7 @@
           last_depth = nil
           last_duration = nil
           corrections = []
+          stack = []
           cumulatives = {} %>
           <div class="tab-pane active" id="stack_trace">
             <div class="head">
@@ -55,13 +59,23 @@
                if skip
                  corrections.unshift event[:depth] if corrections.empty? || corrections.first != event[:depth]
                else
-                 cumulatives[event[:call]] ||= {:duration => 0.0, :count => 0}
-                 cumulatives[event[:call]][:duration] += event[:duration].to_f
-                 cumulatives[event[:call]][:count] += 1
-                 cumulatives[event[:call]][:average] = cumulatives[event[:call]][:duration].to_f / cumulatives[event[:call]][:count].to_f
+                 cumulative = (cumulatives[event[:call]] ||= {:duration => 0.0, :count => 0, :real_duration => 0.0, :real_count => 0})
+                 cumulative[:duration] += event[:duration].to_f
+                 cumulative[:count] += 1
+                 cumulative[:average] = cumulative[:duration].to_f / cumulative[:count].to_f
+
                  corrections.size.times do |i|
                    event[:depth] <= corrections[0] ? corrections.shift : break
                  end
+
+                 stack = stack[0, event[:depth] - corrections.size]
+                 unless stack.include? event[:call]
+                   cumulative[:real_duration] += event[:duration].to_f
+                   cumulative[:real_count] += 1
+                   cumulative[:real_average] = cumulative[:real_duration].to_f / cumulative[:real_count].to_f
+                 end
+                 stack << event[:call]
+
 if last_depth.to_i < event[:depth] - corrections.size %>
 <div class="group"><% if threshold && comment_depth.nil? && last_duration && last_duration < threshold %><% comment_depth = event[:depth] - corrections.size %><%= "\n<!--" %><% end %><% else
 close_tags = ((event[:depth] - corrections.size + 1)..last_depth.to_i).collect do |depth|
@@ -95,10 +109,10 @@ end.reverse.join("")
           </div>
           <div class="tab-pane" id="cumulatives">
             <div class="head">
-              <span class="average"><a href="javascript:StackTracy.sort(0)">Average</a></span>
-              <span class="duration"><a href="javascript:StackTracy.sort(1)">Duration</a></span>
-              <span class="count"><a href="javascript:StackTracy.sort(2)">Count</a></span>
-              <span class="call"><a href="javascript:StackTracy.sort(3)">Call</a></span>
+              <span class="average"><a href="javascript:StackTracy.sort('cumulatives', 0)">Average</a></span>
+              <span class="duration"><a href="javascript:StackTracy.sort('cumulatives', 1)">Duration</a></span>
+              <span class="count"><a href="javascript:StackTracy.sort('cumulatives', 2)">Count</a></span>
+              <span class="call"><a href="javascript:StackTracy.sort('cumulatives', 3)">Call</a></span>
             </div>
             <div class="body"><% cumulatives.sort{|(ak, av), (bk, bv)| bv[:average] <=> av[:average]}.each do |call, stats| %>
 <div>
@@ -106,6 +120,22 @@ end.reverse.join("")
 <span class="duration" abbr="<%= "%.6f" % stats[:duration] %>"><%= "%.6f" % stats[:duration] %></span>
 <span class="count" abbr="<%= stats[:count] %>"><%= stats[:count] %></span>
 <span class="call" abbr="<%= call.gsub("<", "&lt;").gsub(">", "&gt;") %>"><%= call.gsub("<", "&lt;").gsub(">", "&gt;").gsub(/^"(.*)"$/){ "<strong>#{$1}</strong>" } %></span>
+</div><% end %>
+            </div>
+          </div>
+          <div class="tab-pane" id="realtime_cumulatives">
+            <div class="head">
+              <span class="average"><a href="javascript:StackTracy.sort('realtime_cumulatives', 0)">Average</a></span>
+              <span class="duration"><a href="javascript:StackTracy.sort('realtime_cumulatives', 1)">Duration</a></span>
+              <span class="count"><a href="javascript:StackTracy.sort('realtime_cumulatives', 2)">Count</a></span>
+              <span class="call"><a href="javascript:StackTracy.sort('realtime_cumulatives', 3)">Call</a></span>
+            </div>
+            <div class="body"><% cumulatives.sort{|(ak, av), (bk, bv)| bv[:real_average] <=> av[:real_average]}.each do |call, stats| %>
+<div>
+<span class="average" abbr="<%= "%.6f" % stats[:real_average] %>"><%= "%.6f" % stats[:real_average] %></span>
+<span class="duration" abbr="<%= "%.6f" % stats[:real_duration] %>"><%= "%.6f" % stats[:real_duration] %></span>
+<span class="count" abbr="<%= stats[:real_count] %>"><%= stats[:real_count] %></span>
+<span class="call" abbr="<%= call.gsub("<", "&lt;").gsub(">", "&gt;") %>"><%= call.gsub("<", "&lt;").gsub(">", "&gt;").gsub(/^"(.*)"$/){ "<strong>#{$1}</strong>" } %></span>
 </div><% end %>
             </div>
           </div>

metadata

@@ -2,7 +2,7 @@
 name: stack_tracy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Paul Engel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-28 00:00:00 Z
+date: 2012-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rich_support