time_bandits 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWQxOTYzZGM3NGMxMGM5NTc0ZmViNTIyMzJhNDA1ODNiNTExMjg0ZA==
-  data.tar.gz: !binary |-
-    NmQ5MTdiMjNmNWRjNTgzYjA2OTNjM2ExYWI2YzcyNjdiZTI1ZDg1ZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NzAxOTQ2ZDBlNzMyN2IzMWYzYTExOTc3MjVkNmE3MWUyYzBmOTAzNjZiZDgw
-    NjY0Y2M3NjZmNDA2NzQ1Nzk2MmE4YzAzMmNjY2NkZWNhYWMzZTE1ZGMzYzk3
-    NTJhZGZhMzNkZGQ5ZDQ3MGZiMzdhNDEyMGQ3ODAyYjFjZjE3Mjg=
-  data.tar.gz: !binary |-
-    MmJjYWFiOGQxNDc1YjA5MWI1OTI1NWZlYTNmOGNlZTc1OWFlNWI1MDkxYmI5
-    N2YzNjEyMTRlMjc2MmFmZDFkZjIwNWJhMWE3Y2U0Y2Q2ZTAxN2EyZWIxYjhj
-    MDVjNjBkYjBmYjc5OTMwNmQ2ODU5ODM0ZDExZWU5ZjVhZmU5ZWQ=
+SHA1:
+  metadata.gz: 9fae2e6cc7b44a9befcffb7c710c1f760119a17c
+  data.tar.gz: fa6a537a7fff153f5e30917c53f0a284f7d81db7
+SHA512:
+  metadata.gz: 7b813da44b27582d7be37fd98e5dc4c92cc4b05d00be9f3966cf7e98917f74bea5ff3e20e2f4a5f7885c67f513092082b844031db163a844ca3a1a1803fe2d40
+  data.tar.gz: 3ff9e7968d16b4462acd859a8280fbb24aad02fe90ed0036e735975ebac311ee882ae2063bda7c56b1cc1859b23e564b5c899c5e7d8ef7065a810e70cceae281

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 .bundle
 .DS_Store
 .rvmrc
+dump.rdb

data/Gemfile

@@ -6,5 +6,4 @@ gemspec
 # gem "activesupport", "3.2.13"
 gem "activesupport", "4.0.0"
 
-gem "debugger"
-gem "memcached"
+gem "byebug"

data/README.rdoc

@@ -84,7 +84,11 @@ In order for the test to run you need a running memcached and redis-server
 
 == Release Notes
 
-version 0.5.2
+version 0.6.1
+   - switched to byebug (debugger does not full support 2.0 and 2.1 not at all)
+   - adapted garbage collection statistics to work for 2.1
+
+version 0.6.0
    - added redis time consumer
    - fixed rails 4.0 problems with builtin mem_cache_store
    - now only consumers which measured something are added to the completed line

data/lib/time_bandits/time_consumers/garbage_collection.rb

@@ -18,6 +18,7 @@ module TimeBandits
       end
 
       def enable_stats
+        return unless GC.respond_to? :enable_stats
         GC.enable_stats
         if defined?(PhusionPassenger)
           PhusionPassenger.on_event(:starting_worker_process) do |forked|
@@ -26,13 +27,37 @@ module TimeBandits
         end
       end
 
+      if GC.respond_to?(:collections)
+        def _get_collections; GC.collections; end
+      elsif GC.respond_to?(:count)
+        def _get_collections; GC.count; end
+      else
+        def _get_collections; 0; end
+      end
+
+      if ObjectSpace.respond_to?(:allocated_objects)
+        def _get_allocated_objects; ObjectSpace.allocated_objects; end
+      elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.1.0"
+        def _get_allocated_objects; GC.stat(:total_allocated_object); end
+      else
+        def _get_allocated_objects; 0; end
+      end
+
+      if GC.respond_to?(:allocated_size)
+        def _get_allocated_size; GC.allocated_size; end
+      elsif GC.respond_to?(:total_malloced_bytes)
+        def _get_allocated_size; GC.total_malloced_bytes; end
+      else
+        def _get_allocated_size; 0; end
+      end
+
       if GC.respond_to? :heap_slots
 
         def reset
           @consumed = GC.time
-          @collections = GC.collections
-          @allocated_objects = ObjectSpace.allocated_objects
-          @allocated_size = GC.allocated_size
+          @collections = _get_collections
+          @allocated_objects = _get_allocated_objects
+          @allocated_size = _get_allocated_size
           @heap_slots = GC.heap_slots
         end
 
@@ -40,7 +65,7 @@ module TimeBandits
 
         def reset
           @consumed = GC.time
-          @collections = GC.collections
+          @collections = _get_collections
         end
 
       end
@@ -54,17 +79,17 @@ module TimeBandits
       end
 
       def collections
-        GC.collections - @collections
+        _get_collections - @collections
       end
 
       if GC.respond_to? :heap_slots
 
         def allocated_objects
-          ObjectSpace.allocated_objects - @allocated_objects
+          _get_allocated_objects - @allocated_objects
         end
 
         def allocated_size
-          GC.allocated_size - @allocated_size
+          _get_allocated_size - @allocated_size
         end
 
         def heap_growth
@@ -72,13 +97,9 @@ module TimeBandits
         end
 
         if GC.respond_to? :heap_slots_live_after_last_gc
-          def live_data_set_size
-            GC.heap_slots_live_after_last_gc
-          end
+          def live_data_set_size; GC.heap_slots_live_after_last_gc; end
         else
-          def live_data_set_size
-            0
-          end
+          def live_data_set_size; 0; end
         end
 
         GCFORMAT = "GC: %.3f(%d) | HP: %d(%d,%d,%d,%d)"

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/unit/gc_consumer_test.rb

@@ -0,0 +1,58 @@
+require_relative '../test_helper'
+
+class GCConsumerTest < Test::Unit::TestCase
+  def setup
+    TimeBandits.time_bandits = []
+    TimeBandits.add TimeBandits::TimeConsumers::GarbageCollection.instance
+    TimeBandits.reset
+  end
+
+  test "getting metrics" do
+    # example metrics hash:
+    sample = {
+      :gc_time => 0.5,
+      :gc_calls => 0,
+      :heap_growth => 0,
+      :heap_size => 116103,
+      :allocated_objects => 8,
+      :allocated_bytes => 152,
+      :live_data_set_size => 69437
+    }
+    m = TimeBandits.metrics
+    assert_equal sample.keys.sort, m.keys.sort
+  end
+
+  test "formatting" do
+    # example runtime:
+    # "GC: 0.000(0) | HP: 0(116101,6,0,69442)"
+    gc, heap = TimeBandits.runtime.split(' | ')
+    assert_equal "GC: 0.000(0)", gc
+    match = /\AHP: \d+\(\d+,\d+,\d+,\d+\)/
+    assert(heap =~ match, "#{heap} does not match #{match}")
+  end
+
+  test "collecting GC stats" do
+    work
+    check_work
+  end
+
+  private
+  def work
+    TimeBandits.reset
+    a = []
+    10.times do |i|
+      a << (i.to_s * 100)
+    end
+  end
+  def check_work
+    GC.start
+    m = TimeBandits.metrics
+    assert 0 <  m[:gc_calls]
+    assert 0 <  m[:gc_time]
+    assert 0 <= m[:heap_growth]
+    assert 0 <  m[:heap_size]
+    assert 0 <  m[:allocated_objects]
+    assert 0 <  m[:allocated_bytes]
+    assert 0 <= m[:live_data_set_size]
+  end
+end

data/time_bandits.gemspec

@@ -25,5 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("ansi")
   s.add_development_dependency("dalli")
   s.add_development_dependency("redis")
+  s.add_development_dependency("memcached")
+  s.add_development_dependency("minitest", '~> 4.7.5')
 end
 

metadata

@@ -1,113 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: thread_variables
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: thread_variables
 - !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.2
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.2
-  type: :runtime
-  prerelease: false
-  name: activesupport
 - !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'
-  type: :development
-  prerelease: false
-  name: rake
 - !ruby/object:Gem::Dependency
+  name: mocha
   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'
-  type: :development
-  prerelease: false
-  name: mocha
 - !ruby/object:Gem::Dependency
+  name: ansi
   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'
-  type: :development
-  prerelease: false
-  name: ansi
 - !ruby/object:Gem::Dependency
+  name: dalli
   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: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  name: dalli
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: memcached
   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: 4.7.5
   type: :development
   prerelease: false
-  name: redis
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.5
 description: Rails Completed Line on Steroids
 email:
 - skaes@railsexpress.de
@@ -115,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.rdoc
 - README_RAILS2.rdoc
@@ -145,6 +173,7 @@ files:
 - test/unit/active_support_notifications_test.rb
 - test/unit/base_test.rb
 - test/unit/dalli_test.rb
+- test/unit/gc_consumer_test.rb
 - test/unit/memcached_test.rb
 - test/unit/redis_test.rb
 - time_bandits.gemspec
@@ -158,17 +187,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Custom performance logging for Rails
@@ -177,5 +206,6 @@ test_files:
 - test/unit/active_support_notifications_test.rb
 - test/unit/base_test.rb
 - test/unit/dalli_test.rb
+- test/unit/gc_consumer_test.rb
 - test/unit/memcached_test.rb
 - test/unit/redis_test.rb