memory_profiler 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2825892e9a2cf16a0cb685f91b8f754e2d85183
-  data.tar.gz: 248304fe60edea15abc9e501028bae8b1021d295
+  metadata.gz: b3f841c1bfcbaecdaccf8359aa37a7d42605c485
+  data.tar.gz: 599119026dfb887ffc810d81da2b17a9e71f29cf
 SHA512:
-  metadata.gz: 2a6c49cf4df8caac5ddc61d7fe1541e79468a522a3519f1d1965586e7195a20740a4623fee1a07130d0b37d9169ed82c85e0758a05076a0f300c02c0e0031d61
-  data.tar.gz: 9e9b0a6a4b5b5986d2b029fb12f6c1d3eb62613f61d25df15a3bf2888237f56ead9bb6a980c25cfe5029d8249cb8b265cd58ab427aeb115f9565c6a235e1f7e0
+  metadata.gz: ac957555ecad713d83c891c87bf118f1a00dcf0633d1f18b3d38181b472f654db5218eb3c6494d66ae7b3a5da8bdd9425a4457a3c5e77f69514d8628490cba98
+  data.tar.gz: 54eb5dc1456d906452b152b000abcaca1d6b229d70e259ca54b2bad36476d69a94edbb2666daa603595a174f468ea7edf619e8afe6554ad3e2606443fbd1d11a

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+# Changelog
+
+## 0.9.7
+- Improved class name detection for proxy objects, BasicObject objects, and
+ other edge cases @inossidabile @Hamdiakoguz @dgynn
+
+## 0.9.6
+- FIX: pretty_print was failing under some conditions @vincentwoo
+- FIX: if #class is somehow nil don't crash @vincentwoo
+
+## 0.9.5
+- Improved stability and performance @dgynn
+
+## 0.9.4
+- FIX: remove incorrect RVALUE offset on 2.2  @dgynn
+- FEATURE: add total memory usage @dgynn
+
+## 0.9.3
+- Add class reporting
+
+## 0.9.2
+- Fix incorrect syntax in rescue clause
+
+## 0.9.0
+- This is quite stable, upping version to reflect
+- Fixed bug where it would crash when location was nil for some reason
+
+## 0.0.4
+- Added compatibility with released version of Ruby 2.1.0
+- Cleanup to use latest APIs available in 2.1.0
+
+## 0.0.3
+- Added string analysis

data/README.md

@@ -362,33 +362,3 @@ Memory profiler also performs some String analysis to help you find strings that
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-## Changelog
-
-### 0.9.6
-- FIX: pretty_print was failing under some conditions @vincentwoo
-- FIX: if #class is somehow nil don't crash @vincentwoo
-
-### 0.9.5
-- Improved stability and performance @dgynn
-
-### 0.9.4
-- FIX: remove incorrect RVALUE offset on 2.2  @dgynn
-- FEATURE: add total memory usage @dgynn
-
-### 0.9.3
-- Add class reporting
-
-### 0.9.2
-- Fix incorrect syntax in rescue clause
-
-### 0.9.0
-- This is quite stable, upping version to reflect
-- Fixed bug where it would crash when location was nil for some reason
-
-### 0.0.4
-- Added compatibility with released version of Ruby 2.1.0
-- Cleanup to use latest APIs available in 2.1.0
-
-### 0.0.3
-- Added string analysis

data/lib/memory_profiler/helpers.rb

@@ -25,7 +25,7 @@ module MemoryProfiler
     end
 
     def lookup_class_name(klass)
-      @class_name_cache[klass] ||= (klass && klass.name) || '<<Unknown>>'
+      @class_name_cache[klass] ||= ((klass.is_a?(Class) && klass.name) || '<<Unknown>>').to_s
     end
 
   end

data/lib/memory_profiler/polychrome.rb

@@ -88,10 +88,6 @@ module MemoryProfiler
       "\033[7m#{str}\033[27m"
     end
 
-    def no_colors
-      self.gsub /\033\[\d+m/, "";
-    end
-
   end
 
 end

data/lib/memory_profiler/reporter.rb

@@ -48,14 +48,8 @@ module MemoryProfiler
 
       ObjectSpace.each_object do |obj|
         next unless ObjectSpace.allocation_generation(obj) == generation
-        begin
-          found = allocated[obj.__id__]
-          retained[obj.__id__] = found if found
-        rescue
-          # __id__ is not defined on BasicObject, skip it
-          # we can probably transplant the object_id at this point,
-          # but it is quite rare
-        end
+        found = allocated[obj.__id__]
+        retained[obj.__id__] = found if found
       end
       ObjectSpace.trace_object_allocations_clear
 
@@ -70,52 +64,43 @@ module MemoryProfiler
     # Stores results along with meta data of objects collected.
     def object_list(generation)
 
-      objs = []
-
-      ObjectSpace.each_object do |obj|
-        next unless ObjectSpace.allocation_generation(obj) == generation
-        begin
-          if !trace || trace.include?(obj.class)
-            objs << obj
-          end
-        rescue
-          # may not respond to class so skip
-        end
-      end
-
       rvalue_size = GC::INTERNAL_CONSTANTS[:RVALUE_SIZE]
       rvalue_size_adjustment = RUBY_VERSION < '2.2' ? rvalue_size : 0
       helper = Helpers.new
 
       result = StatHash.new.compare_by_identity
 
-      objs.each do |obj|
+      ObjectSpace.each_object do |obj|
+        next unless ObjectSpace.allocation_generation(obj) == generation
+
         file = ObjectSpace.allocation_sourcefile(obj) || "(no name)".freeze
         next if @ignore_files && @ignore_files =~ file
         next if @allow_files && !(@allow_files =~ file)
 
-        line       = ObjectSpace.allocation_sourceline(obj)
-        location   = helper.lookup_location(file, line)
-        klass      = obj.class rescue nil
-        class_name = helper.lookup_class_name(klass)
-        gem        = helper.guess_gem(file)
-        string     = '' << obj  if klass == String
+        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
+        next if @trace && !trace.include?(klass)
 
         begin
-          object_id = obj.__id__
+          line       = ObjectSpace.allocation_sourceline(obj)
+          location   = helper.lookup_location(file, line)
+          class_name = helper.lookup_class_name(klass)
+          gem        = helper.guess_gem(file)
+
+          string     = '' << obj  if klass == String
 
           memsize = ObjectSpace.memsize_of(obj) + rvalue_size_adjustment
           # compensate for API bug
           memsize = rvalue_size if memsize > 100_000_000_000
-          result[object_id] = MemoryProfiler::Stat.new(class_name, gem, file, location, memsize, string)
+          result[obj.__id__] = MemoryProfiler::Stat.new(class_name, gem, file, location, memsize, string)
         rescue
-          # __id__ is not defined, give up
+          # give up if any any error occurs inspecting the object
         end
       end
 
-      # Although `objs` will go out of scope, clear the array so objects can definitely be GCd
-      objs.clear
-
       result
     end
   end

data/lib/memory_profiler/results.rb

@@ -63,7 +63,11 @@ module MemoryProfiler
     # @param [Hash] options the options for output
     # @option opts [String] :to_file a path to your log file
     # @option opts [Boolean] :color_output a flag for whether to colorize output
-    def pretty_print(io = STDOUT, **options)
+    def pretty_print(io = $stdout, **options)
+      # Handle the special case that Ruby PrettyPrint expects `pretty_print`
+      # to be a customized pretty printing function for a class
+      return io.pp_object(self) if defined?(PP) && io.is_a?(PP)
+
       io = File.open(options[:to_file], "w") if options[:to_file]
 
       color_output = options.fetch(:color_output) { io.respond_to?(:isatty) && io.isatty }

data/lib/memory_profiler/top_n.rb

@@ -2,16 +2,15 @@ module MemoryProfiler
   module TopN
     # Fast approach for determining the top_n entries in a Hash of Stat objects.
     # Returns results for both memory (memsize summed) and objects allocated (count) as a tuple.
-    def top_n(max, metric)
+    def top_n(max, metric_method)
 
-      stats_by_metric = self.values.map! { |stat| [stat.send(metric), stat.memsize] }
+      stat_totals = self.values.group_by(&metric_method).map do |metric, stats|
+        [metric, stats.reduce(0) { |sum, stat| sum + stat.memsize }, stats.size]
+      end
 
-      stat_totals = stats_by_metric.group_by { |metric_value, _memsize| metric_value }.
-          map { |key, values| [key, values.reduce(0) { |sum, item| _key, memsize = item ; sum + memsize }, values.size] }
-
-      stats_by_memsize = stat_totals.sort_by! { |metric, memsize, _count| [-memsize, metric] }.first(max).
+      stats_by_memsize = stat_totals.sort_by! { |metric, memsize, _count| [-memsize, metric] }.take(max).
           map! { |metric, memsize, _count| { data: metric, count: memsize } }
-      stats_by_count = stat_totals.sort_by! { |metric, _memsize, count| [-count, metric] }.first(max).
+      stats_by_count = stat_totals.sort_by! { |metric, _memsize, count| [-count, metric] }.take(max).
           map! { |metric, _memsize, count| { data: metric, count: count } }
 
       [stats_by_memsize, stats_by_count]

data/lib/memory_profiler/version.rb

@@ -1,3 +1,3 @@
 module MemoryProfiler
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: memory_profiler
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2016-11-06 00:00:00.000000000 Z
+dependencies: []
 description: Memory profiling routines for Ruby 2.1+
 email:
 - sam.saffron@gmail.com
@@ -87,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - lib/memory_profiler.rb
@@ -119,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Memory profiling routines for Ruby 2.1+