vernier 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1af998d7d2517b6c73e0ef7ec8a3e0762c9c0ca23dd859d3c268842f064612f
-  data.tar.gz: 558ad40b4ca261719e241f22806112e9ff18b2ba0e1a65d5c24067deee0803e0
+  metadata.gz: 6e8d610b954485d3bccefa47408932dddd5806b618caa2958d689f8c0c8fbb3d
+  data.tar.gz: 2423bf5e06dd1168e21f0a5063050e897137c37bd09ce68a540af9d84b0a7546
 SHA512:
-  metadata.gz: 58a0c75db2f1ffb90017f887c4e6813653ef908efc4601cbe6fe105aa1493c5344028355d1ec68658e59c34d36b885fcd59340de553bfffc1a72fcadd7668398
-  data.tar.gz: a80cd4ab4c0da94d3799cbedfe93de02788dc48bb7626565eff62cfc7606aa75c93892f5dab17d6b076abf6ea361cbf9231940cfb40384c8116490aff5dee79e
+  metadata.gz: 942b097d843b63457650254b2e9717698939df9ee40c02ff367832d344121e6ffdafffbc2e0824d70229bf5d4187d1cf0eb64491402a4c54c4c5f6dd8fb0b98f
+  data.tar.gz: 2f710c6b9eeb8e4e352290902aed1a4142ea5b48df7039ee49de66dc7c9f7411e25cb77319addba69a15f072f08b3820a51535fe19070a4e77341aa6c000a57b

data/Gemfile

@@ -12,3 +12,5 @@ gem "rake-compiler"
 gem "benchmark-ips"
 
 gem "minitest", "~> 5.0"
+
+gem "zlib", ">= 3.2.1"

data/lib/vernier/collector.rb

@@ -29,6 +29,7 @@ module Vernier
         result.instance_variable_set(:@threads, {
           0 => {
             tid: 0,
+            is_main: true,
             name: "custom",
             started_at: @started_at,
             samples: @samples,
@@ -80,6 +81,7 @@ module Vernier
         result.instance_variable_set(:@threads, {
           0 => {
             tid: 0,
+            is_main: true,
             name: "retained memory",
             started_at: @started_at,
             samples: samples,

data/lib/vernier/output/cpuprofile.rb

@@ -1,8 +1,12 @@
 require "json"
 
+require_relative "../output_helpers"
+
 module Vernier
   module Output
     class Cpuprofile
+      include OutputHelpers
+
       def initialize(profile)
         @profile = profile
       end
@@ -98,7 +102,9 @@ module Vernier
         line = stack_table.frame_line_no(frame_idx) - 1
 
         func_name = stack_table.func_name(func_idx)
+        func_name = sanitize_string(func_name) if func_name
         filename = stack_table.func_filename(func_idx)
+        filename = sanitize_string(filename) if filename
 
         node_id = nodes.length
         node = {

data/lib/vernier/output/file_listing.rb

@@ -1,23 +1,19 @@
 # frozen_string_literal: true
 
 require_relative "filename_filter"
+require_relative "../output_helpers"
 require "cgi/escape"
 
 module Vernier
   module Output
     class FileListing
+      include OutputHelpers
+
       class SamplesByLocation
         attr_accessor :self, :total
         def initialize
           @self = @total = 0
         end
-
-        def +(other)
-          ret = SamplesByLocation.new
-          ret.self = @self + other.self
-          ret.total = @total + other.total
-          ret
-        end
       end
 
       def initialize(profile)
@@ -25,6 +21,8 @@ module Vernier
       end
 
       def samples_by_file
+        return @samples_by_file if defined?(@samples_by_file)
+
         thread = @profile.main_thread
         if Hash === thread
           # live profile
@@ -38,22 +36,9 @@ module Vernier
         weights = thread[:weights]
         samples = thread[:samples]
 
-        self_samples_by_frame = Hash.new do |h, k|
-          h[k] = SamplesByLocation.new
-        end
-
-        samples.zip(weights).each do |stack_idx, weight|
-          # self time
-          top_frame_index = stack_table.stack_frame_idx(stack_idx)
-          self_samples_by_frame[top_frame_index].self += weight
+        stack_weights = collapse_stack_weights(samples, weights)
 
-          # total time
-          while stack_idx
-            frame_idx = stack_table.stack_frame_idx(stack_idx)
-            self_samples_by_frame[frame_idx].total += weight
-            stack_idx = stack_table.stack_parent_idx(stack_idx)
-          end
-        end
+        self_by_frame, total_by_frame = frame_weights(stack_table, stack_weights)
 
         samples_by_file = Hash.new do |h, k|
           h[k] = Hash.new do |h2, k2|
@@ -61,19 +46,64 @@ module Vernier
           end
         end
 
-        self_samples_by_frame.each do |frame, samples|
+        self_by_frame.each_with_index do |self_weight, frame|
+          total_weight = total_by_frame[frame]
+          next if self_weight == 0 && total_weight == 0
+
           line = stack_table.frame_line_no(frame)
           func_index = stack_table.frame_func_idx(frame)
           filename = stack_table.func_filename(func_index)
 
-          samples_by_file[filename][line] += samples
+          location = samples_by_file[filename][line]
+          location.self += self_weight
+          location.total += total_weight
         end
 
-        samples_by_file.transform_keys! do |filename|
+        @samples_by_file = samples_by_file.transform_keys! do |filename|
           filename_filter.call(filename)
         end
       end
 
+      # Returns [self_weight, total_weight] arrays indexed by frame, from a
+      # hash of per-stack weights.
+      #
+      # The stack table is a prefix tree whose parent is always interned
+      # before its children (parent idx < child idx), so total weights are
+      # accumulated bottom-up in a single reverse pass.
+      private def frame_weights(stack_table, stack_weights)
+        # Scatter the sparse weights into an array indexed by stack.
+        stack_totals = Array.new(stack_table.stack_count, 0)
+        stack_weights.each do |stack_idx, weight|
+          stack_totals[stack_idx] = weight
+        end
+
+        # Accumulate each stack's total into its parent, children first,
+        # so a single descending pass completes every subtree's total.
+        (stack_totals.length - 1).downto(0) do |stack_idx|
+          parent_idx = stack_table.stack_parent_idx(stack_idx)
+          next unless parent_idx
+
+          if parent_idx >= stack_idx
+            raise "Invalid profile: stack table is not parent-before-child ordered"
+          end
+
+          stack_totals[parent_idx] += stack_totals[stack_idx]
+        end
+
+        self_by_frame = Array.new(stack_table.frame_count, 0)
+        total_by_frame = Array.new(stack_table.frame_count, 0)
+        stack_weights.each do |stack_idx, weight|
+          self_by_frame[stack_table.stack_frame_idx(stack_idx)] += weight
+        end
+        stack_totals.each_with_index do |total, stack_idx|
+          next if total == 0
+
+          total_by_frame[stack_table.stack_frame_idx(stack_idx)] += total
+        end
+
+        [self_by_frame, total_by_frame]
+      end
+
       def output(template: nil)
         output = +""
 
@@ -98,8 +128,7 @@ module Vernier
       end
 
       def total
-        thread = @profile.main_thread
-        thread[:weights].sum
+        @total ||= @profile.main_thread[:weights].sum
       end
 
       def format_file(output, filename, all_samples, total:)

data/lib/vernier/output/firefox.rb

@@ -4,6 +4,7 @@ require "json"
 require "rbconfig"
 
 require_relative "filename_filter"
+require_relative "../output_helpers"
 
 module Vernier
   module Output
@@ -267,6 +268,8 @@ module Vernier
       end
 
       class Thread
+        include OutputHelpers
+
         SAMPLE_CATEGORY_NAMES = {
           1 => "Idle",
           2 => "Stalled"
@@ -638,18 +641,7 @@ module Vernier
 
         def string_table
           @strings.keys.map do |string|
-            if string.ascii_only?
-              string
-            elsif string.encoding == Encoding::UTF_8
-              if string.valid_encoding?
-                string
-              else
-                string.scrub
-              end
-            else
-              # TODO: We might want to guess UTF-8 and escape the binary more explicitly
-              string.dup.force_encoding("UTF-8").scrub
-            end
+            sanitize_string(string)
           end
         end
 

data/lib/vernier/output/top.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+require_relative "../output_helpers"
+
 module Vernier
   module Output
     class Top
+      include OutputHelpers
+
       def initialize(profile, row_limit)
         @profile = profile
         @row_limit = row_limit
@@ -57,10 +61,10 @@ module Vernier
             @profile._stack_table
           end
 
-        stack_weights = Hash.new(0)
-        thread[:samples].zip(thread[:weights]) do |stack_idx, weight|
-          stack_weights[stack_idx] += weight
-        end
+        samples = thread[:samples]
+        weights = thread[:weights]
+
+        stack_weights = collapse_stack_weights(samples, weights)
 
         total = stack_weights.values.sum
 

data/lib/vernier/output_helpers.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Vernier
+  module OutputHelpers
+    # Collapses parallel samples/weights arrays into a hash of total weight
+    # per stack index. Retained-mode profiles have one sample per object and
+    # many samples share the same stack, so collapsing first keeps later
+    # aggregation proportional to the number of unique stacks.
+    def collapse_stack_weights(samples, weights)
+      stack_weights = Hash.new(0)
+      samples.each_with_index do |stack_idx, idx|
+        stack_weights[stack_idx] += weights[idx]
+      end
+      stack_weights
+    end
+
+    # Returns a string safe to embed in JSON output: valid UTF-8 with any
+    # invalid bytes replaced. Method names and paths can carry arbitrary
+    # encodings (e.g. BINARY or Shift_JIS source), which would otherwise
+    # raise JSON::GeneratorError.
+    def sanitize_string(string)
+      if string.ascii_only?
+        string
+      elsif string.encoding == Encoding::UTF_8
+        string.valid_encoding? ? string : string.scrub
+      else
+        # We don't know the real encoding; interpret the bytes as UTF-8
+        # and replace anything invalid.
+        string.dup.force_encoding(Encoding::UTF_8).scrub
+      end
+    end
+  end
+end

data/lib/vernier/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vernier
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - John Hawthorn
@@ -106,6 +106,7 @@ files:
 - lib/vernier/output/firefox.rb
 - lib/vernier/output/markdown.rb
 - lib/vernier/output/top.rb
+- lib/vernier/output_helpers.rb
 - lib/vernier/parsed_profile.rb
 - lib/vernier/result.rb
 - lib/vernier/stack_table.rb
@@ -134,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A next generation CRuby profiler
 test_files: []