vernier 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e53177832167777357ffdfc79c26f1957a8707804cb85349560faa6d433fd49
-  data.tar.gz: bc89ef70d31f160e8a874c27a2b9bb6479c1a4e631549dd4ac583b7137177660
+  metadata.gz: 89d2c876f873a04f937175301ba227c5dd3e883f0e2fefbaf6927f409c88d511
+  data.tar.gz: 469d58efbd5ea8ef87288d0d7c07e74a4ede94aa60743afce80ed57904f4e40e
 SHA512:
-  metadata.gz: 642f607cc4998decb398e88dd196b920ae9592c139fdf7527ad7feb383579b22ff697fa4dede77d62866784415f798d8b020cdb0f8122cb30ea02a6fa66cc7cb
-  data.tar.gz: '03749312aad61f1c336863dece9417afc01df487a6f3f44f7c55e94fcb81b9df32e2aabd232b61a22b7add89f969cfe2a685816ea38cfd66447ac2f7813ed96a'
+  metadata.gz: 41bd857e2a36ddf757ffd5139d3b897202039ac8fb21020856c7f44b979b34488d154d2f88fa3a397124a131109be9c047a765d249d9b190a7f320d66c33c0c5
+  data.tar.gz: fc6141244154307323bb0460ff7142c20cf7d57e7b6f03caf33b9febe9a975b82c1bdbb435174645523287edc4675ea551d37c00baf5a02137f1bc56ddd4a6ef

data/exe/vernier

@@ -3,45 +3,134 @@
 require "optparse"
 require "vernier/version"
 
-banner = <<-END
+module Vernier
+  module CLI
+    def self.run(options)
+      banner = <<-END
 Usage: vernier run [FLAGS] -- COMMAND
 
 FLAGS:
-END
+      END
 
-options = {}
-parser = OptionParser.new(banner) do |o|
-  o.version = Vernier::VERSION
+      OptionParser.new(banner) do |o|
+        o.version = Vernier::VERSION
 
-  o.on('--output [FILENAME]', String, "output filename") do |s|
-    options[:output] = s
-  end
-  o.on('--interval [MICROSECONDS]', Integer, "sampling interval (default 500)") do |i|
-    options[:interval] = i
-  end
-  o.on('--allocation_sample_rate [ALLOCATIONS]', Integer, "allocation sampling interval (default 0 disabled)") do |i|
-    options[:allocation_sample_rate] = i
-  end
-  o.on('--signal [NAME]', String, "specify a signal to start and stop the profiler") do |s|
-    options[:signal] = s
-  end
-  o.on('--start-paused', "don't automatically start the profiler") do
-    options[:start_paused] = true
-  end
-  o.on('--hooks [HOOKS]', String, "Enable instrumentation hooks. Currently supported: rails") do |s|
-    options[:hooks] = s
+        o.on('--output [FILENAME]', String, "output filename") do |s|
+          options[:output] = s
+        end
+        o.on('--interval [MICROSECONDS]', Integer, "sampling interval (default 500)") do |i|
+          options[:interval] = i
+        end
+        o.on('--allocation_sample_rate [ALLOCATIONS]', Integer, "allocation sampling interval (default 0 disabled)") do |i|
+          options[:allocation_sample_rate] = i
+        end
+        o.on('--signal [NAME]', String, "specify a signal to start and stop the profiler") do |s|
+          options[:signal] = s
+        end
+        o.on('--start-paused', "don't automatically start the profiler") do
+          options[:start_paused] = true
+        end
+        o.on('--hooks [HOOKS]', String, "Enable instrumentation hooks. Currently supported: rails") do |s|
+          options[:hooks] = s
+        end
+      end
+    end
+
+    def self.view(options)
+      banner = <<-END
+Usage: vernier view [FLAGS] FILENAME
+
+FLAGS:
+      END
+
+      OptionParser.new(banner) do |o|
+        o.on('--top [COUNT]', Integer, "number of frames to show (default 20)") do |i|
+          options[:top] = i
+        end
+      end
+    end
+
+    def self.inverted_tree(top, file)
+      # Print the inverted tree from a Vernier profile
+      require "json"
+
+      is_gzip = File.binread(file, 2) == "\x1F\x8B".b # check for gzip header
+
+      json = if is_gzip
+        require "zlib"
+        Zlib::GzipReader.open(file) { |gz| gz.read }
+      else
+        File.read file
+      end
+
+      info = JSON.load json
+
+      main = info["threads"].find { |thread| thread["isMainThread"] }
+
+      weight_by_frame = Hash.new(0)
+
+      stack_frames = main["stackTable"]["frame"]
+      frame_table = main["frameTable"]["func"]
+      func_table = main["funcTable"]["name"]
+      string_array = main["stringArray"]
+
+      main["samples"]["stack"].zip(main["samples"]["weight"]).each do |stack, weight|
+        top_frame_index = stack_frames[stack]
+        func_index = frame_table[top_frame_index]
+        string_index = func_table[func_index]
+        str = string_array[string_index]
+        weight_by_frame[str] += weight
+      end
+
+      total = weight_by_frame.values.inject :+
+
+      header = ["Samples", "%", ""]
+      widths = header.map(&:bytesize)
+
+      columns = weight_by_frame.sort_by { |k,v| v }.reverse.first(top).map { |k,v|
+        entry = [v.to_s, ((v / total.to_f) * 100).round(1).to_s, k]
+        entry.each_with_index { |str, i| widths[i] = str.bytesize if widths[i] < str.bytesize }
+        entry
+      }
+
+      print_separator widths
+      print_row header, widths
+      print_separator widths
+      columns.each { print_row(_1, widths) }
+      print_separator widths
+    end
+
+    def self.print_row(list, widths)
+      puts("|" + list.map.with_index { |str, i| " " + str.ljust(widths[i] + 1) }.join("|") + "|")
+    end
+
+    def self.print_separator(widths)
+      puts("+" + widths.map { |i| "-" * (i + 2) }.join("+") + "+")
+    end
   end
 end
 
-parser.parse!
-parser.abort(parser.help) if ARGV.shift != "run"
-parser.abort(parser.help) if ARGV.empty?
+options = {}
+run = Vernier::CLI.run(options)
+view = Vernier::CLI.view(options)
 
-env = {}
-options.each do |k, v|
-  env["VERNIER_#{k.to_s.upcase}"] = v.to_s
-end
-vernier_path = File.expand_path('../lib', __dir__)
-env['RUBYOPT'] = "-I #{vernier_path} -r vernier/autorun #{ENV['RUBYOPT']}"
+case ARGV.shift
+when "run"
+  run.parse!
+  run.abort(run.help) if ARGV.empty?
 
-Kernel.exec(env, *ARGV)
+  env = {}
+  options.each do |k, v|
+    env["VERNIER_#{k.to_s.upcase}"] = v.to_s
+  end
+  vernier_path = File.expand_path('../lib', __dir__)
+  env['RUBYOPT'] = "-I #{vernier_path} -r vernier/autorun #{ENV['RUBYOPT']}"
+
+  Kernel.exec(env, *ARGV)
+when "view"
+  view.parse!
+  view.abort(view.help) if ARGV.empty?
+  Vernier::CLI.inverted_tree(options[:top] || 20, ARGV.shift)
+else
+  run.abort(run.help + "\n" + view.help)
+end

data/ext/vernier/vernier.cc

@@ -1114,7 +1114,11 @@ class Thread {
             sample.sample();
 
             int stack_idx = translator.translate(frame_list, sample);
-            allocation_samples.record_sample(stack_idx, TimeStamp::Now(), 1);
+            if (stack_idx >= 0) {
+                allocation_samples.record_sample(stack_idx, TimeStamp::Now(), 1);
+            } else {
+                // TODO: should we log an empty frame?
+            }
         }
 
         void set_state(State new_state) {

data/lib/vernier/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vernier
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - John Hawthorn
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,7 +102,7 @@ metadata:
   homepage_uri: https://github.com/jhawthorn/vernier
   source_code_uri: https://github.com/jhawthorn/vernier
   changelog_uri: https://github.com/jhawthorn/vernier
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.5.16
+signing_key: 
 specification_version: 4
 summary: A next generation CRuby profiler
 test_files: []