vernier 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2a2674d6f0654668b9fbfc03ec935fa21640585ae0b4dbd7567b472f975f26
-  data.tar.gz: 660264f955f4f2e9a9ae7e64acbb1b59d4d91f87d1a28d7a62aed0adabc9c51a
+  metadata.gz: 4be5edc549ea93934096d98e46c4ffcabc140d06e27303f6ec6b01de8201983c
+  data.tar.gz: a6322324723a2f31f15a0b7e98a6de72bf5c555e29e21951b7f466466ecedd6f
 SHA512:
-  metadata.gz: aa249d63850b2ea08a3165e9b7045dcec5542173198aeef05c4c39047f604a5faa12b0d72c6f8fa7983e45a7011a3a5529dc4e4b7fbee426b2461f14b5d6b6c3
-  data.tar.gz: 93f82cd596d454db747afb11abe669b4ed53b6fd6691ebf9ab43ed53e5f2be9406ce93424e3b1179c9a7d13df28cdcbface7d2e80544aa1d2ba45d8a19385696
+  metadata.gz: 92377006ae54cc5cc89934cc3c393fdfe02746035235b507196ef9d360b6d843c50db4382e0b53ec253f1d08f10f78e28d7daf10979f26187bb7c925933dec56
+  data.tar.gz: 0e963a838d3c319d93d73ae224c9e11caa51562583ef37f2d5fff40781281d30ee714273a9ce021c9e8285942825a3356388d2f68b51315fb5275c5bb96b49a6

data/.ruby-version

@@ -1 +1 @@
-3.4.4
+3.4.6

data/exe/vernier

@@ -79,7 +79,7 @@ FLAGS:
 
       parsed_profile = Vernier::ParsedProfile.read_file(file)
 
-      puts Vernier::Output::Top.new(parsed_profile).output
+      puts Vernier::Output::Top.new(parsed_profile, top).output
       puts Vernier::Output::FileListing.new(parsed_profile).output
     end
   end

data/lib/vernier/output/firefox.rb

@@ -8,35 +8,59 @@ require_relative "filename_filter"
 module Vernier
   module Output
     # https://profiler.firefox.com/
-    # https://github.com/firefox-devtools/profiler/blob/main/src/types/profile.js
+    # https://github.com/firefox-devtools/profiler/blob/main/src/types/profile.ts
     class Firefox
       class Categorizer
+        RAILS_COMPONENTS = %w[ activesupport activemodel activerecord actionview
+                               actionpack activejob actionmailer actioncable
+                               activestorage actionmailbox actiontext railties ]
+
+        AVAILABLE_COLORS = %w[ transparent purple green orange yellow lightblue
+                               blue brown magenta red lightred darkgrey grey ]
+
+        ORDERED_CATEGORIES = %w[ Kernel Rails gem Ruby ] # This is in the order of preference
+
         attr_reader :categories
+
         def initialize
           @categories = []
           @categories_by_name = {}
 
-          add_category(name: "Ruby", color: "grey") do |c|
-            rails_components = %w[ activesupport activemodel activerecord
-              actionview actionpack activejob actionmailer actioncable
-              activestorage actionmailbox actiontext railties ]
+          add_category(name: "Kernel", color: "magenta") do |c|
             c.add_subcategory(
-              name: "Rails",
-              matcher: gem_path(*rails_components)
+              name: "Kernel",
+              matcher: starts_with("<internal")
             )
+          end
+
+          add_category(name: "gem", color: "lightblue") do |c|
             c.add_subcategory(
               name: "gem",
               matcher: starts_with(*Gem.path)
             )
+          end
+
+          add_category(name: "Rails", color: "red") do |c|
+            RAILS_COMPONENTS.each do |subcategory|
+              c.add_subcategory(
+                name: subcategory,
+                matcher: gem_path(subcategory)
+              )
+            end
+          end
+
+          add_category(name: "Ruby", color: "purple") do |c|
             c.add_subcategory(
               name: "stdlib",
               matcher: starts_with(RbConfig::CONFIG["rubylibdir"])
             )
           end
+
           add_category(name: "Idle", color: "transparent")
           add_category(name: "Stalled", color: "transparent")
 
           add_category(name: "GC", color: "red")
+
           add_category(name: "cfunc", color: "yellow", matcher: "<cfunc>")
 
           add_category(name: "Thread", color: "grey")
@@ -69,7 +93,10 @@ module Vernier
 
         class Category
           attr_reader :idx, :name, :color, :matcher, :subcategories
+
           def initialize(idx, name:, color:, matcher: nil)
+            raise ArgumentError, "invalid color: #{color}" if color && AVAILABLE_COLORS.none?(color)
+
             @idx = idx
             @name = name
             @color = color
@@ -315,19 +342,13 @@ module Vernier
             func_implementations[func_idx]
           end
 
-          cfunc_category = @categorizer.get_category("cfunc")
-          ruby_category = @categorizer.get_category("Ruby")
           func_categories, func_subcategories = [], []
           filenames.each do |filename|
-            if filename == "<cfunc>"
-              func_categories << cfunc_category
-              func_subcategories << 0
-            else
-              func_categories << ruby_category
-              subcategory = ruby_category.subcategories.detect {|c| c.matches?(filename) }&.idx || 0
-              func_subcategories << subcategory
-            end
+            category, subcategory = categorize_filename(filename)
+            func_categories << category
+            func_subcategories << subcategory
           end
+
           @frame_categories = @stack_table_hash[:frame_table].fetch(:func).map do |func_idx|
             func_categories[func_idx]
           end
@@ -336,6 +357,32 @@ module Vernier
           end
         end
 
+        def categorize_filename(filename)
+          return cfunc_category_and_subcategory if filename == "<cfunc>"
+
+          category, subcategory = find_category_and_subcategory(filename, Categorizer::ORDERED_CATEGORIES)
+          return category, subcategory if subcategory
+
+          ruby_category_and_subcategory
+        end
+
+        def cfunc_category_and_subcategory
+          [@categorizer.get_category("cfunc"), 0]
+        end
+
+        def ruby_category_and_subcategory
+          [@categorizer.get_category("Ruby"), 0]
+        end
+
+        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
+            return category, subcategory if subcategory
+          end
+          [nil, nil]
+        end
+
         def filter_filenames(filenames)
           filter = FilenameFilter.new
           filenames.map do |filename|

data/lib/vernier/output/top.rb

@@ -3,14 +3,16 @@
 module Vernier
   module Output
     class Top
-      def initialize(profile)
+      def initialize(profile, row_limit)
         @profile = profile
+        @row_limit = row_limit
       end
 
       class Table
-        def initialize(header)
+        def initialize(header, row_limit)
           @header = header
           @rows = []
+          @row_limit = row_limit
           yield self
         end
 
@@ -24,7 +26,7 @@ module Vernier
               row_separator,
               format_row(@header),
               row_separator
-            ] + @rows.map do |row|
+            ] + @rows.first(@row_limit).map do |row|
               format_row(row)
             end + [row_separator]
           ).join("\n")
@@ -70,7 +72,7 @@ module Vernier
           top_by_self[name] += weight
         end
 
-        Table.new %w[Samples % name] do |t|
+        Table.new %w[Samples % name], @row_limit do |t|
           top_by_self.sort_by(&:last).reverse.each do |frame, samples|
             pct = 100.0 * samples / total
             t << [samples.to_s, pct.round(1).to_s, frame]

data/lib/vernier/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vernier
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - John Hawthorn
@@ -105,7 +105,6 @@ files:
 - lib/vernier/stack_table_helpers.rb
 - lib/vernier/thread_names.rb
 - lib/vernier/version.rb
-- vernier.gemspec
 homepage: https://github.com/jhawthorn/vernier
 licenses:
 - MIT
@@ -127,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A next generation CRuby profiler
 test_files: []

data/vernier.gemspec

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/vernier/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "vernier"
-  spec.version = Vernier::VERSION
-  spec.authors = ["John Hawthorn"]
-  spec.email = ["john@hawthorn.email"]
-
-  spec.summary = "A next generation CRuby profiler"
-  spec.description = "Next-generation Ruby 3.2.1+ sampling profiler. Tracks multiple threads, GVL activity, GC pauses, idle time, and more."
-  spec.homepage = "https://github.com/jhawthorn/vernier"
-  spec.license = "MIT"
-
-  unless ENV["IGNORE_REQUIRED_RUBY_VERSION"]
-    spec.required_ruby_version = ">= 3.2.1"
-  end
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = spec.homepage
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.extensions = ["ext/vernier/extconf.rb"]
-
-  spec.add_development_dependency "activesupport"
-  spec.add_development_dependency "gvltest"
-  spec.add_development_dependency "rack"
-end