memory_profiler 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36702507c9914c94dfb3218eff88eb04baedbfd19e17773b0cc0783003fbd773
-  data.tar.gz: 447062d601138e3640117983a523380f455798f921294d63f61e72da55c1a620
+  metadata.gz: 7da6190dc6c838833e47d41765b0cfff971a88fd650968126345a022b7adab9f
+  data.tar.gz: 99c847bf242406d438b06a9a4c747bf7200556f7380e4c93fa69476e523d0675
 SHA512:
-  metadata.gz: 35cf530186236d02baa145fec37e519f24eb3322334154559af3f938b955c648ad8eb298b830e83d9ab1751842e49b59aa52f8c7b2e350c7f1fec77cd065d28a
-  data.tar.gz: a4d24d2a9c3f985fdbdec38c3d14b9dcb0db816aef70c2f590565c5a5e81beb5ffc353a56c220f814f3f135ee1d5a4a6c1e100b1a95b080a351eace0d3f0c6b6
+  metadata.gz: 821c0b5746630a740e23570b31bc1faab53b2be90d1f53000310ca2fab122b8e254f93ae25fffa63ca95b7c350b721d62320276dada82c05712945047446a683
+  data.tar.gz: a354ea734d19c16510c6c76612d58ea6d830f39883ef215accbc9f3c33a3f745b55a90275cdef8779b03d1dc4779fe156a9e0bfb1aa1f1073cd03f4b54696e4f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.9.11
+- Reduce memory needed for string allocation tracing @dgynn
+- Use yield rather than block.call to reduce an allocation @dgynn
+- Ensure string allocation locations sort consistently @dgynn
+
 ## 0.9.10
 - Add better detection for stdlib "gems"
 

data/lib/memory_profiler/helpers.rb

@@ -32,7 +32,10 @@ module MemoryProfiler
     end
 
     def lookup_string(obj)
-      @string_cache[obj] ||= String.new << obj
+      # This string is shortened to 200 characters which is what the string report shows
+      # The string report can still list unique strings longer than 200 characters
+      #   separately because the object_id of the shortened string will be different
+      @string_cache[obj] ||= obj[0,200]
     end
   end
 end

data/lib/memory_profiler/reporter.rb

@@ -65,7 +65,7 @@ module MemoryProfiler
     def run(&block)
       start
       begin
-        block.call
+        yield
       rescue Exception
         ObjectSpace.trace_object_allocations_stop
         GC.enable

data/lib/memory_profiler/results.rb

@@ -47,16 +47,26 @@ module MemoryProfiler
     end
 
     def string_report(data, top)
-      data.values
-          .keep_if { |stat| stat.string_value }
-          .map! { |stat| [stat.string_value, stat.location] }
-          .group_by { |string, _location| string }
-          .sort_by {|string, list| [-list.size, string] }
-          .first(top)
-          .map { |string, list| [string, list.group_by { |_string, location| location }
-                                             .map { |location, locations| [location, locations.size] }
-                                ]
-          }
+      grouped_strings = data.values.
+        keep_if { |stat| stat.string_value }.
+        group_by { |stat| stat.string_value.object_id }.
+        values
+
+      if grouped_strings.size > top
+        cutoff = grouped_strings.sort_by!(&:size)[-top].size
+        grouped_strings.keep_if { |list| list.size >= cutoff }
+      end
+
+      grouped_strings.
+        sort! { |a, b| a.size == b.size ? a[0].string_value <=> b[0].string_value : b.size <=> a.size }.
+        first(top).
+        # Return array of [string, [[location, count], [location, count], ...]
+        map! { |list| [list[0].string_value,
+                       list.group_by { |stat| stat.location }.
+                            map { |location, stat_list| [location, stat_list.size] }.
+                            sort_by!(&:last).reverse!
+                      ]
+        }
     end
 
     # Output the results of the report
@@ -110,7 +120,7 @@ module MemoryProfiler
       io.puts "#{title} String Report"
       io.puts @colorize.line("-----------------------------------")
       strings.each do |string, stats|
-        io.puts "#{stats.reduce(0) { |a, b| a + b[1] }.to_s.rjust(10)}  #{@colorize.string((string[0..200].inspect))}"
+        io.puts "#{stats.reduce(0) { |a, b| a + b[1] }.to_s.rjust(10)}  #{@colorize.string((string.inspect))}"
         stats.sort_by { |x, y| [-y, x] }.each do |location, count|
           io.puts "#{@colorize.path(count.to_s.rjust(10))}  #{location}"
         end

data/lib/memory_profiler/version.rb

@@ -1,3 +1,3 @@
 module MemoryProfiler
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memory_profiler
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies: []
 description: Memory profiling routines for Ruby 2.1+
 email:
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Memory profiling routines for Ruby 2.1+