time_bandits 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc64382ba7806f658e3f31c2fb51e9309c9373c
-  data.tar.gz: b943632018760ae71fc694dfeb028b2c2fea7cd0
+  metadata.gz: 35f89fba835aab0fa8499beaa01ec8f407d8f91c
+  data.tar.gz: 89209eb4f594b1365907ee4d0c3f2206595f35af
 SHA512:
-  metadata.gz: b564f1041505ecac8a3b4d117acc0c4933eb38f5a19447492d785406681842c243000ceb5b619eb49dc8a970da5be0bc3cc94102c0ada5c7d09f4e75e3a37ed3
-  data.tar.gz: 13e485dea31a244973b93e2595e26e6c27cecd8263060334b957daf927bcde0ce5bf57f7b46fad34b1fce0f003d730044194e8252cd255cd6f1f8e91a5dbf124
+  metadata.gz: 17989ad515a1eae58cae1b6410ad20726852d3e8c12fbdd45c0c1ed3a001ea2b02b1024eb37b72ad4519c8a5015fe41848c00f75cbf29c98d38f703c59937bf4
+  data.tar.gz: de288045a8ff9f03503485a24b63a138d68e024ff2cbf232cad1ef927e45b19371cf77980243fa2c23283a1559bf7bcf94f74896a153aa5ddc085cd432ea7f39

data/README.rdoc

@@ -84,9 +84,11 @@ In order for the test to run you need a running memcached and redis-server
 
 == Release Notes
 
-version 0.6.1
-   - switched to byebug (debugger does not full support 2.0 and 2.1 not at all)
+version 0.7.0
+   - switched to byebug (debugger does not fully support 2.0 and 2.1 not at all)
    - adapted garbage collection statistics to work for 2.1
+   - improved rails 4.x compatibility
+   - GC time consumer now tries to make the most out of an unpatched ruby
 
 version 0.6.0
    - added redis time consumer
@@ -99,14 +101,14 @@ version 0.5.1
 version 0.5:
    - has dropped rails 2 support
    - relies on ActiveSupport::Notifications
-   - is suposedly thread safe
+   - is supposedly thread safe
    - all measurements are thread local (except GC statistics)
    - times are all measured in milliseconds internally
    - added class TimeBandits::TimeConsumers::BaseConsumer to simplify writing custom consumers
 
 == License
 
-Copyright (c) 2009-2012 Stefan Kaes <skaes@railsexpress.de>
+Copyright (c) 2009-2014 Stefan Kaes <skaes@railsexpress.de>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/time_bandits/time_consumers/garbage_collection.rb

@@ -27,6 +27,12 @@ module TimeBandits
         end
       end
 
+      if GC.respond_to?(:time)
+        def _get_gc_time; GC.time; end
+      else
+        def _get_gc_time; 0; end
+      end
+
       if GC.respond_to?(:collections)
         def _get_collections; GC.collections; end
       elsif GC.respond_to?(:count)
@@ -51,23 +57,28 @@ module TimeBandits
         def _get_allocated_size; 0; end
       end
 
-      if GC.respond_to? :heap_slots
-
-        def reset
-          @consumed = GC.time
-          @collections = _get_collections
-          @allocated_objects = _get_allocated_objects
-          @allocated_size = _get_allocated_size
-          @heap_slots = GC.heap_slots
-        end
-
+      if GC.respond_to?(:heap_slots)
+        def _get_heap_slots; GC.heap_slots; end
+      elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.1.0"
+        def _get_heap_slots; GC.stat(:heap_live_slot) + GC.stat(:heap_free_slot) + GC.stat(:heap_final_slot); end
       else
+        def _get_heap_slots; 0; end
+      end
 
-        def reset
-          @consumed = GC.time
-          @collections = _get_collections
-        end
+      if GC.respond_to?(:heap_slots_live_after_last_gc)
+        def live_data_set_size; GC.heap_slots_live_after_last_gc; end
+      elsif GC.respond_to?(:stat) && RUBY_VERSION >= "2.1.0"
+        def live_data_set_size; GC.stat(:heap_live_slot); end
+      else
+        def live_data_set_size; 0; end
+      end
 
+      def reset
+        @consumed = _get_gc_time
+        @collections = _get_collections
+        @allocated_objects = _get_allocated_objects
+        @allocated_size = _get_allocated_size
+        @heap_slots = _get_heap_slots
       end
 
       def consumed
@@ -75,70 +86,48 @@ module TimeBandits
       end
 
       def consumed_gc_time # ms
-        (GC.time - @consumed).to_f / 1000
+        (_get_gc_time - @consumed).to_f / 1000
       end
 
       def collections
         _get_collections - @collections
       end
 
-      if GC.respond_to? :heap_slots
-
-        def allocated_objects
-          _get_allocated_objects - @allocated_objects
-        end
-
-        def allocated_size
-          _get_allocated_size - @allocated_size
-        end
-
-        def heap_growth
-          GC.heap_slots - @heap_slots
-        end
-
-        if GC.respond_to? :heap_slots_live_after_last_gc
-          def live_data_set_size; GC.heap_slots_live_after_last_gc; end
-        else
-          def live_data_set_size; 0; end
-        end
-
-        GCFORMAT = "GC: %.3f(%d) | HP: %d(%d,%d,%d,%d)"
-
-        def runtime
-          heap_slots = GC.heap_slots
-          heap_growth = self.heap_growth
-          allocated_objects = self.allocated_objects
-          allocated_size = self.allocated_size
-          GCHacks.heap_dump if heap_growth > 0 && @@heap_dumps_enabled && defined?(GCHacks)
-          GCFORMAT % [consumed_gc_time, collections, heap_growth, heap_slots, allocated_objects, allocated_size, live_data_set_size]
-        end
+      def allocated_objects
+        _get_allocated_objects - @allocated_objects
+      end
 
-        def metrics
-          {
-            :gc_time => consumed_gc_time,
-            :gc_calls => collections,
-            :heap_growth => heap_growth,
-            :heap_size => GC.heap_slots,
-            :allocated_objects => allocated_objects,
-            :allocated_bytes => allocated_size,
-            :live_data_set_size => live_data_set_size
-          }
-        end
+      def allocated_size
+        _get_allocated_size - @allocated_size
+      end
 
-      else
+      def heap_growth
+        _get_heap_slots - @heap_slots
+      end
 
-        def runtime
-          "GC: %.3f(%d)" % [consumed_gc_time, collections]
-        end
+      GCFORMAT = "GC: %.3f(%d) | HP: %d(%d,%d,%d,%d)"
 
-        def metrics
-          {
-            :gc_time => consumed_gc_time,
-            :gc_calls => collections
-          }
-        end
+      def runtime
+        heap_slots = _get_heap_slots
+        heap_growth = self.heap_growth
+        allocated_objects = self.allocated_objects
+        allocated_size = self.allocated_size
+        GCHacks.heap_dump if heap_growth > 0 && @@heap_dumps_enabled && defined?(GCHacks)
+        GCFORMAT % [consumed_gc_time, collections, heap_growth, heap_slots, allocated_objects, allocated_size, live_data_set_size]
+      end
 
+      def metrics
+        {
+          :gc_time => consumed_gc_time,
+          :gc_calls => collections,
+          :heap_growth => heap_growth,
+          :heap_size => _get_heap_slots,
+          :allocated_objects => allocated_objects,
+          :allocated_bytes => allocated_size,
+          :live_data_set_size => live_data_set_size
+        }
       end
+
     end
   end
 end

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/test/unit/gc_consumer_test.rb

@@ -47,12 +47,22 @@ class GCConsumerTest < Test::Unit::TestCase
   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]
+    if GC.respond_to?(:time)
+      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]
+    else
+      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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables