rack-mini-profiler 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f6c4ad1e41a0b8cf00506f6c3d732a0a8ea2dc1
-  data.tar.gz: 0a4e5b357dd0473b157ba8728c069cd165fbb99f
+  metadata.gz: 9377633424424e89db32b3a32dac8e65a133558e
+  data.tar.gz: 4946cb1baa99559aee12e93ab62289d50efe9458
 SHA512:
-  metadata.gz: 91b62e7d1beec331e6d104bbf3efe4b2e267c1d93e83166d3289d15798e3a777f847e8f7a0d49f138098e3fea075dcc771b13691534087c6911cf08072e157ee
-  data.tar.gz: 81115816fa927e35361804b8e8ef79148d39283cbf7b7609020dd993b811e7af4972f38b5c00d75a04f01eb3a3c1e33a2e0a3e5fbe74370efccd25694f069257
+  metadata.gz: c25fe1d216a7f0ea2e641176557bc6e8ec3a33b3a244e8eab06f74e9d2b1a7092b511f09221fe0f2262e6cac3789d60c07a071d02abc7bf4639f439377e07c62
+  data.tar.gz: eec98bef439c1c455238a122eec88c8664fccfc4a6ef1be8574f973c0604f2fd95aa52eb1bc1c2aa9e1aa51b45b129a79482aedf4be8a3c73c35873d05352d85

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 # CHANGELOG
+
+## 0.9.5 - 2014-07-08 (Sam Saffron)
+
+- [FEATURE] improve pp=analyze-memory
+
 ## 0.9.4 - 2014-07-08 (Sam Saffron)
 - [UX] added a link to "more" actions in profiler
 - [FEATURE] pp=help now displays links

data/lib/mini_profiler/profiler.rb

@@ -463,23 +463,50 @@ module Rack
     def analyze_memory
       require 'objspace'
 
+      utf8 = "utf-8"
+
+      GC.start
+
+      trunc = lambda do |str|
+        str.length > 200 ? str : str[0..200]
+
+        if str.encoding != Encoding::UTF_8
+          str = str.dup
+          str.force_encoding(utf8)
+
+          unless str.valid_encoding?
+            # work around bust string with a double conversion
+            str.encode!("utf-16","utf-8",:invalid => :replace)
+            str.encode!("utf-8","utf-16")
+          end
+        end
+
+        str
+      end
+
       body = "ObjectSpace stats:\n\n"
 
-      body << ObjectSpace.count_objects
+      counts = ObjectSpace.count_objects
+      total_strings = counts[:T_STRING]
+
+      body << counts
         .sort{|a,b| b[1] <=> a[1]}
         .map{|k,v| "#{k}: #{v}"}
         .join("\n")
 
-      body << "\n\n\n1000 Largest strings:\n\n"
-
       strings = []
-      max_size = 1000
+      string_counts = Hash.new(0)
+      sample_strings = []
 
-      GC.start
-      GC.start
+      max_size = 1000
+      sample_every = total_strings / max_size
 
+      i = 0
       ObjectSpace.each_object(String) do |str|
-        strings << [str[0..200], str.length]
+        i += 1
+        string_counts[str] += 1
+        strings << [trunc.call(str), str.length]
+        sample_strings << [trunc.call(str), str.length] if i % sample_every == 0
         if strings.length > max_size * 2
           trim_strings(strings, max_size)
         end
@@ -487,7 +514,14 @@ module Rack
 
       trim_strings(strings, max_size)
 
-      body << strings.map{|s,len| "#{s}\n(#{len})\n\n"}.join("\n")
+      body << "\n\n\n1000 Largest strings:\n\n"
+      body << strings.map{|s,len| "#{s}\n(len: #{len})\n\n"}.join("\n")
+
+      body << "\n\n\n1000 Sample strings:\n\n"
+      body << sample_strings.map{|s,len| "#{s}\n(len: #{len})\n\n"}.join("\n")
+
+      body << "\n\n\n1000 Most common strings:\n\n"
+      body << string_counts.sort{|a,b| b[1] <=> a[1]}[0..max_size].map{|s,len| "#{trunc.call(s)}\n(x #{len})\n\n"}.join("\n")
 
       text_result(body)
     end

data/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '0.9.4'
+    VERSION = '0.9.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Sam Saffron