memory_tracker 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb923ce2e1e745654ec6424cc6991c1672db8e92
-  data.tar.gz: 6c57f86823beb6905a70c5cb09a7ac787fa7f997
+  metadata.gz: 5d034885b36b92cbe3e175ffdb7fb26890e3ba1a
+  data.tar.gz: 037010fff3c82ee9a487d6b36cd4abe37beaeee8
 SHA512:
-  metadata.gz: 5ad3423a35aa91e1937cca83504a155d5b512fc1dd0dffa7ea98aae21814efb7968134cf3a23fe1e1150bbf886db0d41d2c369950e7760e4ebdea1a2f1c41bd5
-  data.tar.gz: c7d76c6f94d49bdad4224c152339ff504aee7d7a70829f1b4b40b6c1467575f542e9cee69032a52c88e1a398a8304b2c296c27b709d9dffac4f67b72c9d4a690
+  metadata.gz: 0dffc3d046e6a7622d6379c1c0dad2e3d175603f9b10b1516b6f7329f0b53b860759a07069087f5b6174977365ce42551ec410ce93c351b3664caea88639f7d5
+  data.tar.gz: 7ec5aaa4cde2bdf10d8d828c3f6d33c1318d34110028c6b90cc1ccdfd440a88fc4161cbce41a37ff3748b4792edf234c9bd1a2b53b947d5a1ba6a89d8644e921

data/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    byebug (4.0.3)
+    byebug (4.0.5)
       columnize (= 0.9.0)
     columnize (0.9.0)
     diff-lcs (1.2.5)

data/app/controllers/memory_tracker/dashboards_controller.rb

@@ -22,7 +22,7 @@ module MemoryTracker
       @pid = Process.pid
       @rss = Request.rss
       @vsize = Request.vsize
-      @num_heaps = GC.stat[:heap_used]
+      @num_heaps = GcStat.heap_used
 
       respond_to do |format|
         format.json do

data/lib/memory_tracker/gc_stat.rb

@@ -1,20 +1,74 @@
 module MemoryTracker
   class GcStat
-    attr_reader :stats
+
+    include Enumerable
+
+    RUBY22_TO_CANONICAL_MAPPING = { total_allocated_objects: :total_allocated_object,
+                                    total_freed_objects:     :total_freed_object,
+                                    heap_allocated_pages:    :heap_used,
+                                    heap_live_slots:         :heap_live_num,
+                                    heap_free_slots:         :heap_free_num,
+                                    heap_final_slots:        :heap_final_num,
+                                    heap_sorted_length:      :heap_length
+                                  }
+    CANONICAL_TO_RUBY22_MAPPING = RUBY22_TO_CANONICAL_MAPPING.invert
 
     def initialize(rss, vsize)
       @stats = GC.stat.merge({ :rss => rss, :vsize => vsize})
     end
 
+    def each(&block)
+      @stats.each do |k, v|
+        yield canonical_key_name(k), v
+      end
+    end
+
+    def keys
+      @stats.keys
+    end
+
     def ordered_keys
-      @stats.keys.sort
+      @stats.keys.map { |k| canonical_key_name(k) }.sort
     end
 
     def ordered_values(ordered_columns = ordered_keys)
       ordered_columns.inject([]) do |vals, key|
-        vals << @stats[key]
-        vals
+        vals << @stats[current_version_key_name(key)]
+      end
+    end
+
+    def [](key)
+      @stats[current_version_key_name(key)]
+    end
+
+    def canonical_key_name(key)
+      self.class.canonical_key_name(key)
+    end
+
+    def current_version_key_name(key)
+      self.class.current_version_key_name(key)
+    end
+
+    def self.canonical_key_name(key)
+      canonical = key
+      case RUBY_VERSION
+      when /\A2\.2\./
+        canonical = RUBY22_TO_CANONICAL_MAPPING.fetch(key, key)
       end
+      canonical
+    end
+
+    def self.current_version_key_name(key)
+      current_key_name = key
+      case RUBY_VERSION
+      when /\A2\.2\./
+        current_key_name = CANONICAL_TO_RUBY22_MAPPING.fetch(key, key)
+      end
+      current_key_name
+    end
+
+    def self.heap_used
+      GC.stat[current_version_key_name(:heap_used)]
     end
 
     def self.gcdiff(before, after)
@@ -43,8 +97,8 @@ module MemoryTracker
 
     def initialize(before, after)
       @after = after
-      @stats = after.stats.inject({}) do |h, (k, v)|
-        h[k] = after.stats[k] - before.stats[k]
+      @stats = after.inject({}) do |h, (k, v)|
+        h[k] = after[k] - before[k]
         h
       end
     end
@@ -55,8 +109,8 @@ module MemoryTracker
       h[:total_allocated_object] = stats[:total_allocated_object]
       h[:count] = stats[:count]
       h[:rss] = stats[:rss]
-      h[:heap_used] = @after.stats[:heap_used]
-      h[:in_use]    = @after.stats[:total_allocated_object] - @after.stats[:total_freed_object]
+      h[:heap_used] = @after[:heap_used]
+      h[:in_use]    = @after[:total_allocated_object] - @after[:total_freed_object]
       h
     end
   end

data/lib/memory_tracker/stores/gcstat_logfile_store.rb

@@ -3,7 +3,7 @@ module MemoryTracker
     class GcstatLogfileStore < Base
       register_store :gcstat_logfile
 
-      COLUMNS = [ :count, :heap_final_num, :heap_free_num, :heap_increment, :heap_length, :heap_live_num, :heap_used, :rss, :total_allocated_object, :total_freed_object, :vsize ]
+      COLUMNS = [ :count, :heap_final_num, :heap_free_num, :heap_length, :heap_live_num, :heap_used, :rss, :total_allocated_object, :total_freed_object, :vsize ]
 
       def initialize(opts)
         logger_class = opts.fetch(:logger_class, 'Logger')

data/lib/memory_tracker/stores/url_logfile_store.rb

@@ -32,8 +32,8 @@ module MemoryTracker
       def logline
         pid = Process.pid
 
-        end_gcstats   = @request.end_gcstat.stats
-        start_gcstats = @request.start_gcstat.stats
+        end_gcstats   = @request.end_gcstat
+        start_gcstats = @request.start_gcstat
         delta_gcstats = @request.gcstat_delta.stats
 
         log_msg = "#{Time.now.localtime.strftime("%m-%d %H:%M:%S")} pid:#{'%05d' % pid}"

data/lib/memory_tracker/version.rb

@@ -1,3 +1,3 @@
 module MemoryTracker
-  VERSION = "1.2.4"
+  VERSION = "1.3.0"
 end

data/spec/lib/request_spec.rb

@@ -9,8 +9,8 @@ module MemoryTracker
 
     it 'should initalize start_gcstat' do
       @request.start_gcstat.should be_a(GcStat)
-      @request.start_gcstat.stats.keys.should include :rss
-      @request.start_gcstat.stats.keys.should include :vsize
+      @request.start_gcstat.keys.should include :rss
+      @request.start_gcstat.keys.should include :vsize
     end
 
     it 'should have a controller' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memory_tracker
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Philippe Le Rohellec
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Rails memory allocations tracker