memory_profiler 0.9.14 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187acbd9601ade1bb6ccdb60bfb4c305ada15097f02278529f8f6a6fc7d68666
-  data.tar.gz: 33d797db658d4a4507247a0ae9c4b92da568b86e9246f4571a94774b62285c6b
+  metadata.gz: dea36221189a4ea796d262870a9a09acf48fcfe3b6321814fc3e86cc1f4c37db
+  data.tar.gz: '059ab396fc3c0e928046dd3f5c0e6271a616a369f427ee8d134521bb934e8cd8'
 SHA512:
-  metadata.gz: 977f958e6b9f3292053ccef51bcef01828cda7d29760f131687d21b00222950fbf1ec4629a7021bfdc4665e137c3f75cfd729a29db60b879a5c30f08da0de097
-  data.tar.gz: 1cc221f3bf20520a3063031a4d9830e3303d9d9182cafb746aa77d0059888a4a640f2d6dd39a925e31398664018c98e9324565247046310c15ef823419bb6baf
+  metadata.gz: 69a830fb9ac126817342cc84e70f0796417d119ae337172a6b79a26d10e78a08146a4496915c384c7f993e8c514d43168e8e9d1d925acb856ca77092bdd1535e
+  data.tar.gz: 6de39e21847f551fac3b53107e5fa9d8cba5c6d00cfd39fb104432bc44f83008afefe9c46138ce4560e91880f245456b00f60718593198d735a379e4d93b8d71

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.0 - 02-12-2020
+
+- Added new CLI `ruby-memory-profiler` which can be used to profile scripts @fatkodima
+- Reduced memory usage when generating reports
+- Some optimizations for Ruby 2.7
+- Remove EOL Rubies: 2.3 and 2.4 are no longer supported (use an earlier version of the gem if needed)
+
 ## 0.9.14 - 28-06-2019
 
 - Pass 'normalize_path: true' to pretty_print to have locations stripped

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/SamSaffron/memory_profiler.svg?branch=master)](https://travis-ci.org/SamSaffron/memory_profiler)
+[![CI](https://github.com/SamSaffron/memory_profiler/workflows/CI/badge.svg)](https://github.com/SamSaffron/memory_profiler/actions?query=workflow%3ACI)
 [![Gem Version](https://badge.fury.io/rb/memory_profiler.svg)](https://rubygems.org/gems/memory_profiler)
 
 # MemoryProfiler
@@ -7,7 +7,7 @@ A memory profiler for Ruby
 
 ## Requirements
 
-Ruby(MRI) Version 2.3.8 and above.
+Ruby(MRI) Version 2.5.0 and above.
 
 ## Installation
 
@@ -25,6 +25,25 @@ Or install it yourself as:
 
 ## Usage
 
+There are two ways to use `memory_profiler`:
+* command line
+* convenience API
+
+### Command Line
+
+The easiest way to use memory_profiler is via the command line, which requires no modifications to your program. The basic usage is:
+```
+$ ruby-memory-profiler [options] <script.rb> [--] [script-options]
+```
+Where `script.rb` is the program you want to profile.
+
+For a full list of options, execute the following command:
+```
+ruby-memory-profiler -h
+```
+
+### Convenience API
+
 ```ruby
 require 'memory_profiler'
 report = MemoryProfiler.report do

data/bin/ruby-memory-profiler

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
+require "memory_profiler"
+
+exit MemoryProfiler::CLI.new.run(ARGV)

data/lib/memory_profiler.rb

@@ -9,6 +9,7 @@ require "memory_profiler/stat"
 require "memory_profiler/stat_hash"
 require "memory_profiler/results"
 require "memory_profiler/reporter"
+require "memory_profiler/cli"
 
 module MemoryProfiler
   def self.report(opts = {}, &block)

data/lib/memory_profiler/cli.rb

@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+require "optparse"
+
+module MemoryProfiler
+  class CLI
+    BIN_NAME     = "ruby-memory-profiler"
+    VERSION_INFO = "#{BIN_NAME}  #{MemoryProfiler::VERSION}"
+
+    STATUS_SUCCESS = 0
+    STATUS_ERROR   = 1
+
+    DEFAULTS = {
+      ignore_files: "memory_profiler/lib"
+    }.freeze
+
+    REPORTER_KEYS = [
+      :top, :trace, :ignore_files, :allow_files
+    ].freeze
+
+    RESULTS_KEYS = [
+      :to_file, :color_output, :retained_strings, :allocated_strings,
+      :detailed_report, :scale_bytes, :normalize_paths
+    ].freeze
+
+    private_constant :BIN_NAME, :VERSION_INFO,:STATUS_SUCCESS, :STATUS_ERROR,
+                     :DEFAULTS, :REPORTER_KEYS, :RESULTS_KEYS
+
+    #
+
+    def run(argv)
+      options = {}
+      parser = option_parser(options)
+      parser.parse!(argv)
+
+      options = DEFAULTS.merge(options)
+
+      # Make sure the user specified at least one file
+      unless (script = argv.shift)
+        puts parser
+        puts ""
+        puts "#{VERSION_INFO}  |  ERROR: Must specify a script to run"
+        return STATUS_ERROR
+      end
+
+      MemoryProfiler.start(reporter_options(options))
+      load script
+
+      STATUS_SUCCESS
+    rescue OptionParser::InvalidOption, OptionParser::InvalidArgument, OptionParser::MissingArgument => e
+      puts parser
+      puts e.message
+      STATUS_ERROR
+    ensure
+      report = MemoryProfiler.stop
+      report&.pretty_print(**results_options(options))
+    end
+
+    private
+
+    def option_parser(options)
+      OptionParser.new do |opts|
+        opts.banner = <<~BANNER
+
+              #{VERSION_INFO}
+              A Memory Profiler for Ruby
+
+          Usage:
+              #{BIN_NAME} [options] <script.rb> [--] [script-options]
+        BANNER
+
+        opts.separator ""
+        opts.separator "Options:"
+
+        # Reporter options
+        opts.on("-m", "--max=NUM", Integer, "Max number of entries to output. (Defaults to 50)") do |arg|
+          options[:top] = arg
+        end
+
+        opts.on("--classes=CLASSES", Array, "A class or list of classes you explicitly want to trace.") do |arg|
+          options[:trace] = arg.map { |klass| Object.const_get(klass) }
+        end
+
+        opts.on("--ignore-files=REGEXP", "A regular expression used to exclude certain files from tracing.") do |arg|
+          options[:ignore_files] = "#{arg}|memory_profiler/lib"
+        end
+
+        opts.on("--allow-files=FILES", Array, "A string or list of strings to selectively include in tracing.") do |arg|
+          options[:allow_files] = arg
+        end
+
+        opts.separator ""
+
+        # Results options
+        opts.on("-o", "--out=FILE", "Write output to a file instead of STDOUT.") do |arg|
+          options[:to_file] = arg
+        end
+
+        opts.on("--[no-]color", "Force color output on or off. (Enabled by default)") do |arg|
+          options[:color_output] = arg
+        end
+
+        opts.on("--retained-strings=NUM", Integer, "How many retained strings to print.") do |arg|
+          options[:retained_strings] = arg
+        end
+
+        opts.on("--allocated-strings=NUM", Integer, "How many allocated strings to print.") do |arg|
+          options[:allocated_strings] = arg
+        end
+
+        opts.on("--[no-]detailed", "Print detailed information. (Enabled by default)") do |arg|
+          options[:detailed_report] = arg
+        end
+
+        opts.on("--scale-bytes", "Calculates unit prefixes for the numbers of bytes.") do
+          options[:scale_bytes] = true
+        end
+
+        opts.on("--normalize-paths", "Print location paths relative to gem's source directory.") do
+          options[:normalize_paths] = true
+        end
+
+        opts.on("--pretty", "Easily enable options 'scale-bytes' and 'normalize-paths'") do
+          options[:scale_bytes] = options[:normalize_paths] = true
+        end
+
+        opts.separator ""
+
+        opts.on_tail("-h", "--help", "Show this help message.") do
+          puts opts
+          exit
+        end
+
+        opts.on_tail("-v", "--version", "Show program version.") do
+          puts VERSION_INFO
+          exit
+        end
+      end
+    end
+
+    def reporter_options(options)
+      options.select { |k, _v| REPORTER_KEYS.include?(k) }
+    end
+
+    def results_options(options)
+      options.select { |k, _v| RESULTS_KEYS.include?(k) }
+    end
+  end
+end

data/lib/memory_profiler/helpers.rb

@@ -29,8 +29,35 @@ module MemoryProfiler
       @location_cache[file][line] ||= "#{file}:#{line}"
     end
 
-    def lookup_class_name(klass)
-      @class_name_cache[klass] ||= ((klass.is_a?(Class) && klass.name) || '<<Unknown>>').to_s
+    KERNEL_CLASS_METHOD = Kernel.instance_method(:class)
+    if UnboundMethod.method_defined?(:bind_call)
+      def object_class(obj)
+        klass = obj.class rescue nil
+        unless Class === klass
+          # attempt to determine the true Class when .class returns something other than a Class
+          klass = KERNEL_CLASS_METHOD.bind_call(obj)
+        end
+        klass
+      end
+    else
+      def object_class(obj)
+        klass = obj.class rescue nil
+        unless Class === klass
+          # attempt to determine the true Class when .class returns something other than a Class
+          klass = KERNEL_CLASS_METHOD.bind(obj).call
+        end
+        klass
+      end
+    end
+
+    if Object.name.frozen? # Since Ruby 2.7 Module#name no longer allocate a new string
+      def lookup_class_name(klass)
+        ((klass.is_a?(Class) && klass.name) || '<<Unknown>>').to_s
+      end
+    else
+      def lookup_class_name(klass)
+        @class_name_cache[klass] ||= ((klass.is_a?(Class) && klass.name) || '<<Unknown>>').to_s
+      end
     end
 
     def lookup_string(obj)

data/lib/memory_profiler/polychrome.rb

@@ -5,7 +5,7 @@ module MemoryProfiler
   class Polychrome
 
     def path(text)
-      gray(text)
+      blue(text)
     end
 
     def string(text)
@@ -13,7 +13,7 @@ module MemoryProfiler
     end
 
     def line(text)
-      gray(text)
+      cyan(text)
     end
 
     private

data/lib/memory_profiler/reporter.rb

@@ -99,11 +99,7 @@ module MemoryProfiler
         next if @ignore_files && @ignore_files =~ file
         next if @allow_files && !(@allow_files =~ file)
 
-        klass = obj.class rescue nil
-        unless Class === klass
-          # attempt to determine the true Class when .class returns something other than a Class
-          klass = Kernel.instance_method(:class).bind(obj).call
-        end
+        klass = helper.object_class(obj)
         next if @trace && !trace.include?(klass)
 
         begin

data/lib/memory_profiler/results.rb

@@ -57,9 +57,9 @@ module MemoryProfiler
       self.strings_retained = string_report(retained, top)
 
       self.total_allocated = allocated.size
-      self.total_allocated_memsize = allocated.values.map!(&:memsize).inject(0, :+)
+      self.total_allocated_memsize = total_memsize(allocated)
       self.total_retained = retained.size
-      self.total_retained_memsize = retained.values.map!(&:memsize).inject(0, :+)
+      self.total_retained_memsize = total_memsize(retained)
 
       self
     end
@@ -73,19 +73,22 @@ module MemoryProfiler
     end
 
     def string_report(data, top)
-      grouped_strings = data.values
-        .keep_if  { |stat| stat.string_value }
-        .group_by { |stat| stat.string_value.object_id }
-        .values
+      grouped_strings = Hash.new { |hash, key| hash[key] = [] }
+      data.each_value do |stat|
+        if stat.string_value
+          grouped_strings[stat.string_value.object_id] << stat
+        end
+      end
+
+      grouped_strings = grouped_strings.values
 
       if grouped_strings.size > top
-        cutoff = grouped_strings.sort_by!(&:size)[-top].size
-        grouped_strings.keep_if { |list| list.size >= cutoff }
+        grouped_strings.sort_by!(&:size)
+        grouped_strings = grouped_strings.drop(grouped_strings.size - top)
       end
 
       grouped_strings
         .sort! { |a, b| a.size == b.size ? a[0].string_value <=> b[0].string_value : b.size <=> a.size }
-        .first(top)
         .map! do |list|
           # Return array of [string, [[location, count], [location, count], ...]
           [
@@ -171,6 +174,14 @@ module MemoryProfiler
 
     private
 
+    def total_memsize(stat_hash)
+      sum = 0
+      stat_hash.each_value do |stat|
+        sum += stat.memsize
+      end
+      sum
+    end
+
     def print_title(io, title)
       io.puts
       io.puts title

data/lib/memory_profiler/top_n.rb

@@ -6,24 +6,29 @@ module MemoryProfiler
     # Returns results for both memory (memsize summed) and objects allocated (count) as a tuple.
     def top_n(max, metric_method)
 
-      stat_totals =
-        self.values
-          .group_by(&metric_method)
-          .map do |metric, stats|
-            [metric, stats.reduce(0) { |sum, stat| sum + stat.memsize }, stats.size]
-          end
+      metric_memsize = Hash.new(0)
+      metric_objects_count = Hash.new(0)
+
+      each_value do |value|
+        metric = value.send(metric_method)
+
+        metric_memsize[metric] += value.memsize
+        metric_objects_count[metric] += 1
+      end
 
       stats_by_memsize =
-        stat_totals
-          .sort_by! { |metric, memsize, _count| [-memsize, metric] }
+        metric_memsize
+          .to_a
+          .sort_by! { |metric, memsize| [-memsize, metric] }
           .take(max)
-          .map! { |metric, memsize, _count| { data: metric, count: memsize } }
+          .map! { |metric, memsize| { data: metric, count: memsize } }
 
       stats_by_count =
-        stat_totals
-          .sort_by! { |metric, _memsize, count| [-count, metric] }
+        metric_objects_count
+          .to_a
+          .sort_by! { |metric, count| [-count, metric] }
           .take(max)
-          .map! { |metric, _memsize, count| { data: metric, count: count } }
+          .map! { |metric, count| { data: metric, count: count } }
 
       [stats_by_memsize, stats_by_count]
     end

data/lib/memory_profiler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MemoryProfiler
-  VERSION = "0.9.14"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,26 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: memory_profiler
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 1.0.0
 platform: ruby
 authors:
 - Sam Saffron
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies: []
-description: Memory profiling routines for Ruby 2.3+
+description: Memory profiling routines for Ruby 2.5+
 email:
 - sam.saffron@gmail.com
-executables: []
+executables:
+- ruby-memory-profiler
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- bin/ruby-memory-profiler
 - lib/memory_profiler.rb
+- lib/memory_profiler/cli.rb
 - lib/memory_profiler/helpers.rb
 - lib/memory_profiler/monochrome.rb
 - lib/memory_profiler/polychrome.rb
@@ -34,7 +37,7 @@ homepage: https://github.com/SamSaffron/memory_profiler
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -42,15 +45,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.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
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
-summary: Memory profiling routines for Ruby 2.3+
+summary: Memory profiling routines for Ruby 2.5+
 test_files: []