stackprof 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8814b67fbdc027a47b2d087321b62ba3f2c5e0b
-  data.tar.gz: f5584eca1af8afa88afd407846b019dedbf33d3d
+  metadata.gz: f9391ce548ee344fce9ee6e1f2ff86a59f7e6837
+  data.tar.gz: 961fb781cadaa07df721ed11d60df39d10bd0680
 SHA512:
-  metadata.gz: 50d3070d8a4ae606cb90b8e94afdbe4a047abc449a77731ebb9e198dd7fbb4f5e86965bbdba8761f3fbebe01023fca08376b865f84c25dcc7f51d4e7a9752d4c
-  data.tar.gz: 4b0bdc52fdd32bb21b1a10a0061371e2d51ae126cd39c01c6898b2a405f6e2a13dd879e439b610d90fde8661d245f995bcf86063bb76570b2b8ddc793a2bdd2b
+  metadata.gz: fcefc33f597c6ee462651a4242b0251e7a7b8595e5869df0110f59ab9f9174ad86ac3243378f971c1ed0fe96700e36b382ecc325d65a0304ba542e5344c462d2
+  data.tar.gz: d5af5d2e2da5082c32b14b2b255e9d70d10d9958d86605b14ac53b2b91239d617e8f7d29006d06f8513e6facb7cd3904589321908e9d0c6e65cb7e42bcc31966

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackprof (0.2.2)
+    stackprof (0.2.4)
 
 GEM
   remote: https://rubygems.org/
@@ -17,6 +17,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  mocha
-  rake-compiler
+  mocha (~> 0.14)
+  rake-compiler (~> 0.9)
   stackprof!

data/bin/stackprof

@@ -16,10 +16,11 @@ parser = OptionParser.new(ARGV) do |o|
   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('--stackcollapse', 'stackcollapse.pl compatible output (use with flamegraph.pl)'){ options[:format] = :stackcollapse }
-  o.on('--callgrind', 'Callgrind output (use with kcachegrind, gprof2dot)'){ options[:format] = :callgrind }
-  o.on('--graphviz', "Graphviz output (use with dot)\n\n"){ options[:format] = :graphviz }
+  o.on('--file [grep]', "Show annotated code for specified file\n\n"){ |f| options[:format] = :file; options[:filter] = f }
+  o.on('--callgrind', 'Callgrind output (use with kcachegrind, stackprof-gprof2dot.py)'){ options[:format] = :callgrind }
+  o.on('--graphviz', "Graphviz output (use with dot)"){ options[:format] = :graphviz }
+  o.on('--stackcollapse', 'stackcollapse.pl compatible output (use with stackprof-flamegraph.pl)'){ options[:format] = :stackcollapse }
+  o.on('--flamegraph', "timeline-flamegraph output (js)\n\n"){ options[:format] = :flamegraph }
   o.on('--dump', 'Print marshaled profile dump (combine multiple profiles)'){ options[:format] = :dump }
   o.on('--debug', 'Pretty print raw profile data'){ options[:format] = :debug }
 end
@@ -51,6 +52,8 @@ when :graphviz
   report.print_graphviz
 when :stackcollapse
   report.print_stackcollapse
+when :flamegraph
+  report.print_flamegraph
 when :method
   report.print_method(options[:filter])
 when :file

data/ext/stackprof.c

@@ -26,12 +26,18 @@ typedef struct {
 
 static struct {
     int running;
+    int raw;
+    int aggregate;
+
     VALUE mode;
     VALUE interval;
-    VALUE raw;
-    size_t raw_sample_index;
     VALUE out;
 
+    VALUE *raw_samples;
+    size_t raw_samples_len;
+    size_t raw_samples_capa;
+    size_t raw_sample_index;
+
     size_t overall_signals;
     size_t overall_samples;
     size_t during_gc;
@@ -43,7 +49,7 @@ static struct {
 
 static VALUE sym_object, sym_wall, sym_cpu, sym_custom, sym_name, sym_file, sym_line;
 static VALUE sym_samples, sym_total_samples, sym_missed_samples, sym_edges, sym_lines;
-static VALUE sym_version, sym_mode, sym_interval, sym_raw, sym_frames, sym_out;
+static VALUE sym_version, sym_mode, sym_interval, sym_raw, sym_frames, sym_out, sym_aggregate;
 static VALUE sym_gc_samples, objtracer;
 static VALUE gc_hook;
 static VALUE rb_mStackProf;
@@ -56,7 +62,8 @@ stackprof_start(int argc, VALUE *argv, VALUE self)
 {
     struct sigaction sa;
     struct itimerval timer;
-    VALUE opts = Qnil, mode = Qnil, interval = Qnil, raw = Qfalse, out = Qfalse;
+    VALUE opts = Qnil, mode = Qnil, interval = Qnil, out = Qfalse;
+    int raw = 0, aggregate = 1;
 
     if (_stackprof.running)
 	return Qfalse;
@@ -69,7 +76,9 @@ stackprof_start(int argc, VALUE *argv, VALUE self)
 	out = rb_hash_aref(opts, sym_out);
 
 	if (RTEST(rb_hash_aref(opts, sym_raw)))
-	    raw = rb_ary_new();
+	    raw = 1;
+	if (rb_hash_lookup2(opts, sym_aggregate, Qundef) == Qfalse)
+	    aggregate = 0;
     }
     if (!RTEST(mode)) mode = sym_wall;
 
@@ -106,6 +115,7 @@ stackprof_start(int argc, VALUE *argv, VALUE self)
 
     _stackprof.running = 1;
     _stackprof.raw = raw;
+    _stackprof.aggregate = aggregate;
     _stackprof.mode = mode;
     _stackprof.interval = interval;
     _stackprof.out = out;
@@ -234,9 +244,27 @@ stackprof_results(int argc, VALUE *argv, VALUE self)
     st_free_table(_stackprof.frames);
     _stackprof.frames = NULL;
 
-    if (RTEST(_stackprof.raw)) {
-	rb_hash_aset(results, sym_raw, _stackprof.raw);
-	_stackprof.raw = Qfalse;
+    if (_stackprof.raw && _stackprof.raw_samples_len) {
+	size_t len, n, o;
+	VALUE raw_samples = rb_ary_new_capa(_stackprof.raw_samples_len);
+
+	for (n = 0; n < _stackprof.raw_samples_len; n++) {
+	    len = (size_t)_stackprof.raw_samples[n];
+	    rb_ary_push(raw_samples, SIZET2NUM(len));
+
+	    for (o = 0, n++; o < len; n++, o++)
+		rb_ary_push(raw_samples, rb_obj_id(_stackprof.raw_samples[n]));
+	    rb_ary_push(raw_samples, SIZET2NUM((size_t)_stackprof.raw_samples[n]));
+	}
+
+	free(_stackprof.raw_samples);
+	_stackprof.raw_samples = NULL;
+	_stackprof.raw_samples_len = 0;
+	_stackprof.raw_samples_capa = 0;
+	_stackprof.raw_sample_index = 0;
+	_stackprof.raw = 0;
+
+	rb_hash_aset(results, sym_raw, raw_samples);
     }
 
     if (argc == 1)
@@ -315,37 +343,44 @@ void
 stackprof_record_sample()
 {
     int num, i, n;
-    int raw_mode = RTEST(_stackprof.raw);
     VALUE prev_frame = Qnil;
-    size_t raw_len;
 
     _stackprof.overall_samples++;
     num = rb_profile_frames(0, sizeof(_stackprof.frames_buffer), _stackprof.frames_buffer, _stackprof.lines_buffer);
 
-    if (raw_mode) {
+    if (_stackprof.raw) {
 	int found = 0;
-	raw_len = RARRAY_LEN(_stackprof.raw);
 
-	if (RARRAY_LEN(_stackprof.raw) > 0 && RARRAY_AREF(_stackprof.raw, _stackprof.raw_sample_index) == INT2FIX(num)) {
+	if (!_stackprof.raw_samples) {
+	    _stackprof.raw_samples_capa = num * 100;
+	    _stackprof.raw_samples = malloc(sizeof(VALUE) * _stackprof.raw_samples_capa);
+	}
+
+	if (_stackprof.raw_samples_capa <= _stackprof.raw_samples_len + num) {
+	    _stackprof.raw_samples_capa *= 2;
+	    _stackprof.raw_samples = realloc(_stackprof.raw_samples, _stackprof.raw_samples_capa);
+	}
+
+	if (_stackprof.raw_samples_len > 0 && _stackprof.raw_samples[_stackprof.raw_sample_index] == (VALUE)num) {
 	    for (i = num-1, n = 0; i >= 0; i--, n++) {
 		VALUE frame = _stackprof.frames_buffer[i];
-		if (RARRAY_AREF(_stackprof.raw, _stackprof.raw_sample_index + 1 + n) != rb_obj_id(frame))
+		if (_stackprof.raw_samples[_stackprof.raw_sample_index + 1 + n] != frame)
 		    break;
 	    }
 	    if (i == -1) {
-		RARRAY_ASET(_stackprof.raw, raw_len-1, LONG2NUM(NUM2LONG(RARRAY_AREF(_stackprof.raw, raw_len-1))+1));
+		_stackprof.raw_samples[_stackprof.raw_samples_len-1] += 1;
 		found = 1;
 	    }
 	}
 
 	if (!found) {
-	    _stackprof.raw_sample_index = raw_len;
-	    rb_ary_push(_stackprof.raw, INT2FIX(num));
+	    _stackprof.raw_sample_index = _stackprof.raw_samples_len;
+	    _stackprof.raw_samples[_stackprof.raw_samples_len++] = (VALUE)num;
 	    for (i = num-1; i >= 0; i--) {
 		VALUE frame = _stackprof.frames_buffer[i];
-		rb_ary_push(_stackprof.raw, rb_obj_id(frame));
+		_stackprof.raw_samples[_stackprof.raw_samples_len++] = frame;
 	    }
-	    rb_ary_push(_stackprof.raw, INT2FIX(1));
+	    _stackprof.raw_samples[_stackprof.raw_samples_len++] = (VALUE)1;
 	}
     }
 
@@ -358,13 +393,13 @@ stackprof_record_sample()
 
 	if (i == 0) {
 	    frame_data->caller_samples++;
-	} else {
+	} else if (_stackprof.aggregate) {
 	    if (!frame_data->edges)
 		frame_data->edges = st_init_numtable();
 	    st_numtable_increment(frame_data->edges, (st_data_t)prev_frame, 1);
 	}
 
-	if (line > 0) {
+	if (_stackprof.aggregate && line > 0) {
 	    if (!frame_data->lines)
 		frame_data->lines = st_init_numtable();
 	    size_t half = (size_t)1<<(8*SIZEOF_SIZE_T/2);
@@ -428,8 +463,6 @@ frame_mark_i(st_data_t key, st_data_t val, st_data_t arg)
 static void
 stackprof_gc_mark(void *data)
 {
-    if (RTEST(_stackprof.raw))
-	rb_gc_mark(_stackprof.raw);
     if (RTEST(_stackprof.out))
 	rb_gc_mark(_stackprof.out);
 
@@ -472,25 +505,28 @@ stackprof_atfork_child(void)
 void
 Init_stackprof(void)
 {
-    sym_object = ID2SYM(rb_intern("object"));
-    sym_custom = ID2SYM(rb_intern("custom"));
-    sym_wall = ID2SYM(rb_intern("wall"));
-    sym_cpu = ID2SYM(rb_intern("cpu"));
-    sym_name = ID2SYM(rb_intern("name"));
-    sym_file = ID2SYM(rb_intern("file"));
-    sym_line = ID2SYM(rb_intern("line"));
-    sym_total_samples = ID2SYM(rb_intern("total_samples"));
-    sym_gc_samples = ID2SYM(rb_intern("gc_samples"));
-    sym_missed_samples = ID2SYM(rb_intern("missed_samples"));
-    sym_samples = ID2SYM(rb_intern("samples"));
-    sym_edges = ID2SYM(rb_intern("edges"));
-    sym_lines = ID2SYM(rb_intern("lines"));
-    sym_version = ID2SYM(rb_intern("version"));
-    sym_mode = ID2SYM(rb_intern("mode"));
-    sym_interval = ID2SYM(rb_intern("interval"));
-    sym_raw = ID2SYM(rb_intern("raw"));
-    sym_out = ID2SYM(rb_intern("out"));
-    sym_frames = ID2SYM(rb_intern("frames"));
+#define S(name) sym_##name = ID2SYM(rb_intern(#name));
+    S(object);
+    S(custom);
+    S(wall);
+    S(cpu);
+    S(name);
+    S(file);
+    S(line);
+    S(total_samples);
+    S(gc_samples);
+    S(missed_samples);
+    S(samples);
+    S(edges);
+    S(lines);
+    S(version);
+    S(mode);
+    S(interval);
+    S(raw);
+    S(out);
+    S(frames);
+    S(aggregate);
+#undef S
 
     gc_hook = Data_Wrap_Struct(rb_cObject, stackprof_gc_mark, NULL, NULL);
     rb_global_variable(&gc_hook);

data/lib/stackprof/report.rb

@@ -79,6 +79,71 @@ module StackProf
       end
     end
 
+    def print_flamegraph(f=STDOUT, skip_common=true)
+      raise "profile does not include raw samples" unless raw = data[:raw]
+
+      stacks = []
+      max_y = 0
+      while len = raw.shift
+        max_y = len if len > max_y
+        stacks << raw.slice!(0, len+1)
+      end
+      max_x = stacks.inject(0){ |sum, (*stack, weight)| sum + weight }
+
+      f.puts 'flamegraph(['
+      max_y.times do |y|
+        row_prev = nil
+        row_width = 0
+        x = 0
+
+        stacks.each do |*stack, weight|
+          cell = stack[y]
+
+          if cell.nil?
+            if row_prev
+              flamegraph_row(x - row_width, y, row_width, row_prev)
+            end
+
+            row_prev = nil
+            x += weight
+            next
+          end
+
+          if row_prev.nil?        # start new row with this cell
+            row_width = weight
+            row_prev = cell
+            x += weight
+
+          elsif row_prev == cell  # grow current row along x-axis
+            row_width += weight
+            x += weight
+
+          else                    # end current row and start new row
+            flamegraph_row(x - row_width, y, row_width, row_prev)
+            x += weight
+            row_prev = cell
+            row_width = weight
+          end
+
+          row_prev = cell
+        end
+
+        if row_prev
+          next if skip_common && row_width == max_x
+
+          flamegraph_row(x - row_width, y, row_width, row_prev)
+        end
+      end
+      f.puts '])'
+    end
+
+    def flamegraph_row(x, y, weight, addr)
+      frame = frames[addr]
+      print ',' if @rows_started
+      @rows_started = true
+      f.puts %{{"x":#{x},"y":#{y},"width":#{weight},"frame_id":#{addr},"frame":#{frame[:name].dump},"file":#{frame[:file].dump}}}
+    end
+
     def print_graphviz(filter = nil, f = STDOUT)
       if filter
         mark_stack = []

data/stackprof.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'stackprof'
-  s.version = '0.2.3'
+  s.version = '0.2.4'
   s.homepage = 'http://github.com/tmm1/stackprof'
 
   s.authors = 'Aman Gupta'
@@ -11,14 +11,14 @@ Gem::Specification.new do |s|
 
   s.bindir = 'bin'
   s.executables << 'stackprof'
-  s.executables << 'stackprof-flamegraph'
-  s.executables << 'stackprof-gprof2dot'
+  s.executables << 'stackprof-flamegraph.pl'
+  s.executables << 'stackprof-gprof2dot.py'
 
   s.summary = 'sampling callstack-profiler for ruby 2.1+'
   s.description = 'stackprof is a fast sampling profiler for ruby code, with cpu, wallclock and object allocation samplers.'
 
   s.license = 'MIT'
 
-  s.add_development_dependency 'rake-compiler'
-  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'rake-compiler', '~> 0.9'
+  s.add_development_dependency 'mocha', '~> 0.14'
 end

metadata

@@ -1,50 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: stackprof
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 description: stackprof is a fast sampling profiler for ruby code, with cpu, wallclock
   and object allocation samplers.
 email: aman@tmm1.net
 executables:
 - stackprof
-- stackprof-flamegraph
-- stackprof-gprof2dot
+- stackprof-flamegraph.pl
+- stackprof-gprof2dot.py
 extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
@@ -55,8 +55,8 @@ files:
 - README.md
 - Rakefile
 - bin/stackprof
-- bin/stackprof-flamegraph
-- bin/stackprof-gprof2dot
+- bin/stackprof-flamegraph.pl
+- bin/stackprof-gprof2dot.py
 - ext/extconf.rb
 - ext/stackprof.c
 - lib/stackprof/middleware.rb