heap-profiler 0.1.0 → 0.2.0

data/lib/heap_profiler/diff.rb

@@ -2,6 +2,17 @@
 
 module HeapProfiler
   class Diff
+    class DumpSubset
+      def initialize(path, generation)
+        @path = path
+        @generation = generation
+      end
+
+      def each_object(&block)
+        Parser.load_many(@path, since: @generation, &block)
+      end
+    end
+
     attr_reader :allocated
 
     def initialize(report_directory)
@@ -11,23 +22,15 @@ module HeapProfiler
     end
 
     def allocated_diff
-      @allocated_diff ||= build_diff('allocated-diff', @allocated)
+      @allocated_diff ||= DumpSubset.new(@allocated.path, @generation)
     end
 
     def retained_diff
-      @retained_diff ||= build_diff('retained-diff', open_dump('retained'))
+      @retained_diff ||= DumpSubset.new(open_dump('retained').path, @generation)
     end
 
     private
 
-    def build_diff(name, base)
-      diff = open_dump(name)
-      unless diff.exist?
-        base.filter(File.join(@report_directory, "#{name}.heap"), since: @generation)
-      end
-      diff
-    end
-
     def open_dump(name)
       Dump.open(@report_directory, name)
     end

data/lib/heap_profiler/dump.rb

@@ -61,12 +61,8 @@ module HeapProfiler
       end
     end
 
-    def filter(as, since:)
-      Native.filter_heap(path, as, since: since)
-    end
-
-    def each_object(&block)
-      Native.load_many(path, batch_size: 10_000_000, &block)
+    def each_object(since: 0, &block)
+      Parser.load_many(path, since: since, batch_size: 10_000_000, &block)
     end
 
     def stats

data/lib/heap_profiler/full.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "heap_profiler/runtime"
-require "heap_profiler/native"
+require "heap_profiler/parser"
 require "heap_profiler/dump"
 require "heap_profiler/index"
 require "heap_profiler/diff"

data/lib/heap_profiler/index.rb

@@ -11,26 +11,26 @@ module HeapProfiler
     end
 
     def build!
-      @classes, @strings = Native.build_index(@heap.path)
+      @classes, @strings = Parser.build_index(@heap.path)
       self
     end
 
     BUILTIN_CLASSES = {
-      "FILE" => "File",
-      "ICLASS" => "ICLASS",
-      "COMPLEX" => "Complex",
-      "RATIONAL" => "Rational",
-      "BIGNUM" => "Bignum",
-      "FLOAT" => "Float",
-      "ARRAY" => "Array",
-      "STRING" => "String",
-      "HASH" => "Hash",
-      "SYMBOL" => "Symbol",
-      "MODULE" => "Module",
-      "CLASS" => "Class",
-      "REGEXP" => "Regexp",
-      "MATCH" => "MatchData",
-      "ROOT" => "<VM Root>",
+      FILE: "File",
+      ICLASS: "ICLASS",
+      COMPLEX: "Complex",
+      RATIONAL: "Rational",
+      BIGNUM: "Bignum",
+      FLOAT: "Float",
+      ARRAY: "Array",
+      STRING: "String",
+      HASH: "Hash",
+      SYMBOL: "Symbol",
+      MODULE: "Module",
+      CLASS: "Class",
+      REGEXP: "Regexp",
+      MATCH: "MatchData",
+      ROOT: "<VM Root>",
     }.freeze
 
     IMEMO_TYPES = Hash.new { |h, k| h[k] = "<#{k || 'unknown'}> (IMEMO)" }
@@ -42,20 +42,17 @@ module HeapProfiler
         return class_name
       end
 
-      return IMEMO_TYPES[object[:imemo_type]] if type == 'IMEMO'
-      return DATA_TYPES[object[:struct]] if type == 'DATA'
+      return IMEMO_TYPES[object[:imemo_type]] if type == :IMEMO
 
-      if type == "OBJECT" || type == "STRUCT"
-        class_address = object[:class]
-        return unless class_address
+      class_address = object[:class]
+      return unless class_address
 
-        return @classes.fetch(class_address) do
-          $stderr.puts("WARNING: Couldn't infer class name of: #{object.inspect}")
-          nil
-        end
-      end
+      @classes.fetch(class_address) do
+        return DATA_TYPES[object[:struct]] if type == :DATA
 
-      raise "[BUG] Couldn't infer type of #{object.inspect}"
+        $stderr.puts("WARNING: Couldn't infer class name of: #{object.inspect}")
+        nil
+      end
     end
 
     def string_value(object)
@@ -63,15 +60,12 @@ module HeapProfiler
       return value if value
 
       if object[:shared]
-        @strings[cast_address(object[:references].first)]
+        @strings[Native.parse_address(object[:references].first)]
       end
     end
 
-    def cast_address(address)
-      address.to_s.to_i(16)
-    end
-
-    def guess_gem(path)
+    def guess_gem(object)
+      path = object[:file]
       @gems[path] ||=
         if %r{(/gems/.*)*/gems/(?<gemname>[^/]+)} =~ path
           gemname

data/lib/heap_profiler/{native.rb → parser.rb}

@@ -1,22 +1,9 @@
 # frozen_string_literal: true
 
 module HeapProfiler
-  module Native
-    DEFAULT_BATCH_SIZE = 10_000_000 # 10MB
-    class << self
-      def build_index(path, batch_size: DEFAULT_BATCH_SIZE)
-        _build_index(path, batch_size)
-      end
-
-      def load_many(path, batch_size: DEFAULT_BATCH_SIZE, &block)
-        _load_many(path, batch_size, &block)
-      end
-
-      def filter_heap(source_path, destination_path, since:)
-        _filter_heap(source_path, destination_path, since)
-      end
-
-      def ruby_build_index(path)
+  module Parser
+    class Ruby
+      def build_index(path)
         require 'json'
         classes_index = {}
         strings_index = {}
@@ -26,12 +13,12 @@ module HeapProfiler
           case object[:type]
           when 'MODULE', 'CLASS'
             if (name = object[:name])
-              classes_index[ruby_parse_address(object[:address])] = name
+              classes_index[parse_address(object[:address])] = name
             end
           when 'STRING'
             next if object[:shared]
             if (value = object[:value])
-              strings_index[ruby_parse_address(object[:address])] = value
+              strings_index[parse_address(object[:address])] = value
             end
           end
         end
@@ -39,10 +26,38 @@ module HeapProfiler
         [classes_index, strings_index]
       end
 
-      def ruby_parse_address(address)
+      def parse_address(address)
         address.to_i(16)
       end
     end
+
+    class Native
+      DEFAULT_BATCH_SIZE = 10_000_000 # 10MB
+
+      def build_index(path, batch_size: DEFAULT_BATCH_SIZE)
+        _build_index(path, batch_size)
+      end
+
+      def load_many(path, since: nil, batch_size: DEFAULT_BATCH_SIZE, &block)
+        _load_many(path, since, batch_size, &block)
+      end
+    end
+
+    class << self
+      def build_index(path)
+        current.build_index(path)
+      end
+
+      def load_many(path, **kwargs, &block)
+        current.load_many(path, **kwargs, &block)
+      end
+
+      private
+
+      def current
+        Thread.current[:HeapProfilerParser] ||= Native.new
+      end
+    end
   end
   require "heap_profiler/heap_profiler"
 end

data/lib/heap_profiler/results.rb

@@ -78,8 +78,8 @@ module HeapProfiler
       analyzer = Analyzer.new(heap, index)
       dimensions = analyzer.run(@metrics, @groupings)
 
-      io.puts "Total: #{scale_bytes(dimensions['total_memory'].stats)} " \
-              "(#{dimensions['total_objects'].stats} objects)"
+      io.puts "Total: #{scale_bytes(dimensions['total'].memory)} " \
+              "(#{dimensions['total'].objects} objects)"
 
       @metrics.each do |metric|
         next if metric == "strings"
@@ -95,7 +95,7 @@ module HeapProfiler
 
     def dump_data(io, dimensions, metric, grouping, options)
       print_title io, "#{metric} by #{grouping}"
-      data = dimensions["#{metric}_by_#{grouping}"].top_n(options.fetch(:top, 50))
+      data = dimensions[grouping].top_n(metric, options.fetch(:top, 50))
 
       scale_data = metric == "memory" && options[:scale_bytes]
       normalize_paths = options[:normalize_paths]
@@ -141,7 +141,7 @@ module HeapProfiler
 
     def pretty_print(io = $stdout, **options)
       diff = Diff.new(@directory)
-      heaps = @types.to_h { |t| [t, diff.public_send("#{t}_diff")] }
+      heaps = @types.each_with_object({}) { |t, h| h[t] = diff.public_send("#{t}_diff") }
       index = Index.new(diff.allocated)
 
       color_output = options.fetch(:color_output) { io.respond_to?(:isatty) && io.isatty }
@@ -154,8 +154,8 @@ module HeapProfiler
       end
 
       dimensions.each do |type, metrics|
-        io.puts "Total #{type}: #{scale_bytes(metrics['total_memory'].stats)} " \
-                "(#{metrics['total_objects'].stats} objects)"
+        io.puts "Total #{type}: #{scale_bytes(metrics['total'].memory)} " \
+                "(#{metrics['total'].objects} objects)"
       end
 
       @types.each do |type|
@@ -176,7 +176,7 @@ module HeapProfiler
 
     def dump_data(io, dimensions, type, metric, grouping, options)
       print_title io, "#{type} #{metric} by #{grouping}"
-      data = dimensions[type]["#{metric}_by_#{grouping}"].top_n(options.fetch(:top, 50))
+      data = dimensions[type][grouping].top_n(metric, options.fetch(:top, 50))
 
       scale_data = metric == "memory" && options[:scale_bytes]
       normalize_paths = options[:normalize_paths]

data/lib/heap_profiler/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Heap
   module Profiler
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heap-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies: []
 description: Make several heap dumps and summarize allocated, retained memory
 email:
@@ -51,7 +51,7 @@ files:
 - lib/heap_profiler/full.rb
 - lib/heap_profiler/index.rb
 - lib/heap_profiler/monochrome.rb
-- lib/heap_profiler/native.rb
+- lib/heap_profiler/parser.rb
 - lib/heap_profiler/polychrome.rb
 - lib/heap_profiler/reporter.rb
 - lib/heap_profiler/results.rb
@@ -72,14 +72,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Ruby heap profiling tool