vernier 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a504e7ef885ed393a864128d15ca792af4e6ab60f30cdf90afbc36aa5d577b34
-  data.tar.gz: 87ab42b6cc3ea1effae71f3b95bdc4d90c117abf1aadc3d425bb30b4573dafa9
+  metadata.gz: d1af998d7d2517b6c73e0ef7ec8a3e0762c9c0ca23dd859d3c268842f064612f
+  data.tar.gz: 558ad40b4ca261719e241f22806112e9ff18b2ba0e1a65d5c24067deee0803e0
 SHA512:
-  metadata.gz: f52d1d392009084c1511b7b2cc24c51fdb5da983d0fe1dd60286ed9fe0564229ec409513cd179f2af3ceb96f9a085e2f9f48b556ac5ae6b597aba7c13bd56cf8
-  data.tar.gz: 7b8255043801305c221a967a25974ff1e5896393adf8c820784dd980a2eeecfa49f63509b7eeddf1c0f81a7279c29ea87ffa88622de306d0d5b430c23a40c109
+  metadata.gz: 58a0c75db2f1ffb90017f887c4e6813653ef908efc4601cbe6fe105aa1493c5344028355d1ec68658e59c34d36b885fcd59340de553bfffc1a72fcadd7668398
+  data.tar.gz: a80cd4ab4c0da94d3799cbedfe93de02788dc48bb7626565eff62cfc7606aa75c93892f5dab17d6b076abf6ea361cbf9231940cfb40384c8116490aff5dee79e

data/.ruby-version

@@ -1 +1 @@
-3.4.7
+4.0

data/ext/vernier/heap_tracker.cc

@@ -138,6 +138,9 @@ class HeapTracker {
       if (RTEST(tp_newobj)) {
         rb_tracepoint_disable(tp_newobj);
         tp_newobj = Qnil;
+        if (tombstones * 10 > object_list.size()) {
+          rebuild();
+        }
       }
     }
 

data/lib/vernier/output/firefox.rb

@@ -267,6 +267,11 @@ module Vernier
       end
 
       class Thread
+        SAMPLE_CATEGORY_NAMES = {
+          1 => "Idle",
+          2 => "Stalled"
+        }.freeze
+
         attr_reader :profile, :is_start
 
         def initialize(ruby_thread_id, profile, categorizer, name:, tid:, samples:, weights:, timestamps: nil, sample_categories: nil, markers:, started_at:, stopped_at: nil, allocations: nil, is_main: nil, is_start: nil)
@@ -355,6 +360,31 @@ module Vernier
           @frame_subcategories = @stack_table_hash[:frame_table].fetch(:func).map do |func_idx|
             func_subcategories[func_idx]
           end
+
+          @sample_category_idx = SAMPLE_CATEGORY_NAMES.transform_values do |name|
+            @categorizer.get_category(name).idx
+          end
+
+          @samples.zip(@sample_categories).each do |sample, raw_category|
+            next if raw_category == 0
+
+            @categorized_stacks[[sample, raw_category]]
+          end
+
+          base_stack_frames = @stack_table_hash[:stack_table].fetch(:frame)
+          base_frame_count = @stack_table_hash[:frame_table].fetch(:func).size
+          @extra_frames = []
+          @categorized_frame_map = {}
+
+          @categorized_stacks.each_key do |(stack, raw_category)|
+            original_frame_idx = base_stack_frames[stack]
+            key = [original_frame_idx, raw_category]
+            next if @categorized_frame_map.key?(key)
+
+            new_frame_idx = base_frame_count + @extra_frames.size
+            @categorized_frame_map[key] = new_frame_idx
+            @extra_frames << [original_frame_idx, @sample_category_idx[raw_category]]
+          end
         end
 
         def categorize_filename(filename)
@@ -377,7 +407,7 @@ module Vernier
         def find_category_and_subcategory(filename, categories)
           categories.each do |category_name|
             category = @categorizer.get_category(category_name)
-            subcategory = category.subcategories.detect {|c| c.matches?(filename) }&.idx
+            subcategory = category.subcategories.detect { |c| c.matches?(filename) }&.idx
             return category, subcategory if subcategory
           end
           [nil, nil]
@@ -430,7 +460,7 @@ module Vernier
           categories = []
           data = []
 
-          @markers.each_with_index do |(_, name, start, finish, phase, datum), i|
+          @markers.each do |(_, name, start, finish, phase, datum)|
             string_indexes << @strings[name]
             start_times << (start / 1_000_000.0)
 
@@ -463,12 +493,14 @@ module Vernier
         end
 
         def allocations_table
-          return nil if !@allocations
+          return nil unless @allocations
+
           samples, weights, timestamps = @allocations.values_at(:samples, :weights, :timestamps)
-          return nil if samples.size == 0
+          return nil if samples.empty?
+
           size = samples.size
           timestamps = timestamps.map { _1 / 1_000_000.0 }
-          ret = {
+          {
             "time": timestamps,
             "className": ["Object"]*size,
             "typeName": ["JSObject"]*size,
@@ -478,7 +510,6 @@ module Vernier
             "stack": samples,
             "length": size
           }
-          ret
         end
 
         def samples_table
@@ -518,21 +549,22 @@ module Vernier
         end
 
         def stack_table
-          frames =   @stack_table_hash[:stack_table].fetch(:frame).dup
+          base_frames = @stack_table_hash[:stack_table].fetch(:frame)
+          frames = base_frames.dup
           prefixes = @stack_table_hash[:stack_table].fetch(:parent).dup
-          categories  = frames.map{|idx| @frame_categories[idx].idx }
-          subcategories  = frames.map{|idx| @frame_subcategories[idx] }
+          categories = frames.map { |idx| @frame_categories[idx].idx }
+          subcategories = frames.map { |idx| @frame_subcategories[idx] }
 
-          @categorized_stacks.each_key do |(stack, category)|
-            frames << frames[stack]
+          @categorized_stacks.each_key do |(stack, raw_category)|
+            original_frame_idx = base_frames[stack]
+            frames << @categorized_frame_map[[original_frame_idx, raw_category]]
             prefixes << prefixes[stack]
-            categories << category
+            categories << @sample_category_idx[raw_category]
             subcategories << 0
           end
 
-          size = frames.length
-          raise unless frames.size == size
-          raise unless prefixes.size == size
+          raise unless prefixes.size == frames.size
+
           {
             frame: frames,
             category: categories,
@@ -543,18 +575,27 @@ module Vernier
         end
 
         def frame_table
-          funcs = @stack_table_hash[:frame_table].fetch(:func)
-          lines = @stack_table_hash[:frame_table].fetch(:line)
+          funcs = @stack_table_hash[:frame_table].fetch(:func).dup
+          lines = @stack_table_hash[:frame_table].fetch(:line).dup
           raise unless lines.size == funcs.size
 
+          categories = @frame_categories.map(&:idx)
+          subcategories = @frame_subcategories.dup
+          implementations = @frame_implementations.dup
+
+          @extra_frames.each do |(frame_idx, category_idx)|
+            funcs << funcs[frame_idx]
+            lines << lines[frame_idx]
+            categories << category_idx
+            subcategories << 0
+            implementations << implementations[frame_idx]
+          end
+
           size = funcs.size
           none = [nil] * size
           default = [0] * size
           unidentified = [-1] * size
 
-          categories = @frame_categories.map(&:idx)
-          subcategories = @frame_subcategories
-
           {
             address: unidentified,
             inlineDepth: default,
@@ -563,7 +604,7 @@ module Vernier
             func: funcs,
             nativeSymbol: none,
             innerWindowID: none,
-            implementation: @frame_implementations,
+            implementation: implementations,
             line: lines,
             column: none,
             length: size
@@ -605,11 +646,8 @@ module Vernier
               else
                 string.scrub
               end
-            elsif string.encoding == Encoding::BINARY
-              # TODO: We might want to guess UTF-8 and escape the binary more explicitly
-              string.dup.force_encoding("UTF-8").scrub
             else
-              # TODO: ideally we should attempt to properly re-encode here, but right now I think this is dead code
+              # TODO: We might want to guess UTF-8 and escape the binary more explicitly
               string.dup.force_encoding("UTF-8").scrub
             end
           end

data/lib/vernier/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vernier
-  VERSION = "1.10.0"
+  VERSION = "1.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vernier
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - John Hawthorn
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A next generation CRuby profiler
 test_files: []