allocation_tracer 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc53bab30ca77dc661da7cc1d75b0c2ac07881f
-  data.tar.gz: cf61afd7c08c2898d4454002679f29c024e83646
+  metadata.gz: 00e9bb56504e9d79f1182f199aa74bcae77f8452
+  data.tar.gz: 1847dac5c208e05f9e9bc05669d3371082fb0997
 SHA512:
-  metadata.gz: 859f36690133321cc4de4378e115de5ecd6a0a7e0b3793fa728fe41c9c5ad4e918025337b844410c8fca43b8c310e37e0cf785ff2658843ebacc68a0e77c56c3
-  data.tar.gz: defdaa389a03387009e8b29b6232252349db69a035a6618ec27a462d6d45091a7a0a9dc37ef483243d34bf49d36d0b7bab010d5af9c9442a678b55d3fc182fec
+  metadata.gz: fe772a13c725eb2aa94e50dbafbca0a9a1a05113f69b951150437ad6dd4d38237ccd5eaaef3ce36241ca823a3527b77b4628feaa2d30d62da8cbdae63dfe62bd
+  data.tar.gz: 307ba703a9026f632601defaf9da8cd220f9334b1f5286622f64457496ee9696f723a5021dc7db472dac2f84fd17d8268321d8571516b230b23ce82b648c61e2

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
   - 2.1.0
-
+  - 2.2.0

data/README.md

@@ -213,6 +213,30 @@ Note that these numbers includes living objects and dead objects.  For
 dead objects, age means lifetime. For living objects, age means 
 current age.
 
+## Rack middleware
+
+You can use 
+
+```ruby
+require 'rack'
+require 'sinatra'
+require 'rack/allocation_tracer'
+
+use Rack::AllocationTracerMiddleware
+
+get '/' do
+  'foo'
+end
+```
+
+When you access to `http://host/allocation_tracer/` then you can see table of allocation tracer.
+
+You can access the following pages.
+
+* http://host/allocation_tracer/
+* http://host/allocation_tracer/allocated_count_table
+* http://host/allocation_tracer/freed_count_table_page
+
 ## Contributing
 
 1. Fork it ( http://github.com/ko1/allocation_tracer/fork )

data/ext/allocation_tracer/allocation_tracer.c

@@ -102,9 +102,10 @@ delete_unique_str(st_table *tbl, const char *str)
     if (str) {
 	st_data_t n;
 
-	st_lookup(tbl, (st_data_t)str, &n);
+	if (st_lookup(tbl, (st_data_t)str, &n) == 0) rb_bug("delete_unique_str: unreachable");
+
 	if (n == 1) {
-	    st_delete(tbl, (st_data_t *)&str, 0);
+	    st_delete(tbl, (st_data_t *)&str, NULL);
 	    ruby_xfree((char *)str);
 	}
 	else {
@@ -522,6 +523,9 @@ type_sym(int type)
 		TYPE_NAME(T_SYMBOL);
 		TYPE_NAME(T_FIXNUM);
 		TYPE_NAME(T_UNDEF);
+#ifdef T_IMEMO /* introduced from Rub 2.3 */
+		TYPE_NAME(T_IMEMO);
+#endif
 		TYPE_NAME(T_NODE);
 		TYPE_NAME(T_ICLASS);
 		TYPE_NAME(T_ZOMBIE);
@@ -559,7 +563,6 @@ aggregate_result_i(st_data_t key, st_data_t val, void *data)
 	const char *path = (const char *)key_buff->data[i++];
 	if (path) {
 	    rb_ary_push(k, rb_str_new2(path));
-	    delete_unique_str(arg->str_table, path);
 	}
 	else {
 	    rb_ary_push(k, Qnil);

data/lib/allocation_tracer/version.rb

@@ -1,3 +1,3 @@
 module ObjectSpace::AllocationTracer
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/lib/rack/allocation_tracer.rb

@@ -0,0 +1,92 @@
+#
+# Rack middleware
+#
+
+require 'allocation_tracer'
+
+module Rack
+  module AllocationTracerMiddleware
+    def self.new *args
+      TotalTracer.new *args
+    end
+
+    class Tracer
+      def initialize app
+        @app = app
+        @sort_order = (0..7).to_a
+      end
+
+      def allocation_trace_page result
+        table = result.map{|(file, line, klass), (count, oldcount, total_age, min_age, max_age, memsize)|
+          ["#{Rack::Utils.escape_html(file)}:#{'%04d' % line}",
+          klass ? klass.name : '<internal>',
+          count, oldcount, total_age / Float(count), min_age, max_age, memsize]
+        }.sort_by{|vs|
+          ary = @sort_order.map{|i| Numeric === vs[i] ? -vs[i] : vs[i]}
+        }
+
+        headers = %w(path class count old_count average_age max_age min_age memsize).map.with_index{|e, i|
+          "<th><a href='./?s=#{i}'>#{e}</a></th>"
+        }.join("\n")
+        header = "<tr>#{headers}</tr>"
+        body = table.map{|cols|
+          "<tr>" + cols.map{|c| "<td>#{c}</td>"}.join("\n") + "</tr>"
+        }.join("\n")
+        "<table>#{header}#{body}</table>"
+      end
+
+      def count_table_page count_table
+        text = count_table.map{|k, v| "%-10s\t%8d" % [k, v]}.join("\n")
+        "<pre>#{text}</pre>"
+      end
+
+      def allocated_count_table_page
+        count_table_page ObjectSpace::AllocationTracer.allocated_count_table
+      end
+
+      def freed_count_table_page
+        count_table_page ObjectSpace::AllocationTracer.freed_count_table
+      end
+
+      def call env
+        if /\A\/allocation_tracer\// =~ env["PATH_INFO"]
+          result = ObjectSpace::AllocationTracer.result
+          ObjectSpace::AllocationTracer.pause
+
+          p env["PATH_INFO"]
+          case env["PATH_INFO"]
+          when /lifetime_table/
+            raise "Unsupported: lifetime_table"
+          when /allocated_count_table/
+            text = allocated_count_table_page
+          when /freed_count_table/
+            text = freed_count_table_page
+          else
+            text = allocation_trace_page result
+          end
+
+          if /\As=(\d+)/ =~ env["QUERY_STRING"]
+            top = $1.to_i
+            @sort_order.unshift top if @sort_order.delete top
+          end
+
+          begin
+            [200, {"Content-Type" => "text/html"}, [text]]
+          ensure
+            ObjectSpace::AllocationTracer.resume
+          end
+        else
+          @app.call env
+        end
+      end
+    end
+
+    class TotalTracer < Tracer
+      def initialize *args
+        super
+        ObjectSpace::AllocationTracer.setup %i(path line class)
+        ObjectSpace::AllocationTracer.start
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allocation_tracer
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - lib/allocation_tracer.rb
 - lib/allocation_tracer/trace.rb
 - lib/allocation_tracer/version.rb
+- lib/rack/allocation_tracer.rb
 - spec/allocation_tracer_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ko1/allocation_tracer