alloc_track 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2bcef216fe18bd1578ecc1b47f26e10cf6669ad
-  data.tar.gz: 2f003bcc8dc4f0f30a7123518192fb7c9a3c22da
+  metadata.gz: 996bfa135ead01bfda01be1bfc01a20eae7e99b8
+  data.tar.gz: 634b89b83837795cac2491ba924ef96a5404856f
 SHA512:
-  metadata.gz: 50d0ecf47e7a19ac2f9b59e484ab84e8379243d25c7a31487be87924d6b4f486bdecb50613874fcdc07b98a90b1c60946d264257df4597cab590233ebbd6b142
-  data.tar.gz: 86ee7fc454d489abb83df54d01d6fb226da1f0d66f56e5dacc764bf02fbc173494b3ef0bfe1abf2af7f159a978899ca05c4e3c8030c15d62d3bbb743c009a7e7
+  metadata.gz: 2c37c97d902cc8c35130169c50807a731d4472a111b53f1204ecf63a9f96b7dc5dce4c54e7dc579636964fe5e7868d9c007b58dd71d419f6df02464ca0e8504d
+  data.tar.gz: 98fee067ef40dfbcf8dc71224b043a13b6974ebd3b4fbe0bcf0cdde03e74629f2d2aaecaaf06e3c0c9d75cb8cc69b5a67f7dab756516e8b2b50f072351ebdeb3

data/.gitignore

@@ -2,3 +2,4 @@
 /lib/alloc_track/*.so
 /lib/alloc_track/*.bundle
 /tmp/*
+alloc_track-*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    alloc_track (0.0.1)
+    alloc_track (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/alloc_track.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'alloc_track'
-  s.version = '0.0.2'
+  s.version = '0.0.3'
   s.summary = 'allocation tracker for ruby 2.1+'
   s.description = 'tracks memory allocations with rgengc in ruby 2.1'
 

data/ext/alloc_track/alloc_track.c

@@ -2,15 +2,18 @@
 #include "ruby/intern.h"
 #include "ruby/debug.h"
 
-#define ALLOCTRACK_OBJ_BIT FL_USER18
+#define ALLOCTRACK_OBJ_BIT FL_USER19
+
+#define MAX(_x, _y) ( (_x) > (_y) ? (_x) : (_y) )
 
 typedef struct stat_collector {
   struct stat_collector *next; /* not currently used */
   VALUE thread;
-  int current_alloc;
-  int current_free;
-  int current_limit;
-  int limit_signal;
+  int64_t current_alloc;
+  int64_t current_free;
+  int64_t current_limit;
+  int     limit_signal;
+  int64_t max_delta;
 } stat_collector_t;
 
 static VALUE mAllocTrack;
@@ -124,14 +127,14 @@ static VALUE
 alloc()
 {
   validate_started();
-  return INT2FIX(get_collector(rb_thread_current())->current_alloc);
+  return LL2NUM(get_collector(rb_thread_current())->current_alloc);
 }
 
 static VALUE
 _free()
 {
   validate_started();
-  return INT2FIX(get_collector(rb_thread_current())->current_free);
+  return LL2NUM(get_collector(rb_thread_current())->current_free);
 }
 
 static VALUE
@@ -140,7 +143,16 @@ delta()
   stat_collector_t *c;
   validate_started();
   c = get_collector(rb_thread_current());
-  return INT2FIX(c->current_alloc - c->current_free);
+  return LL2NUM(c->current_alloc - c->current_free);
+}
+
+static VALUE
+max_delta()
+{
+  stat_collector_t *c;
+  validate_started();
+  c = get_collector(rb_thread_current());
+  return LL2NUM(c->max_delta);
 }
 
 static VALUE
@@ -173,12 +185,6 @@ limit(VALUE self, VALUE num_allocs)
   return rb_ensure(do_limit, num_allocs, ensure_stopped, Qnil);
 }
 
-static int
-is_collector_enabled(stat_collector_t *c)
-{
-  return c->limit_signal == 0 ? 1 : 0;
-}
-
 static int
 is_collector_limit_exceeded(stat_collector_t *c)
 {
@@ -194,9 +200,10 @@ tracepoint_hook(VALUE tpval, void *data)
   VALUE obj = rb_tracearg_object(tparg);
   switch(flag) {
     case RUBY_INTERNAL_EVENT_NEWOBJ:
-      if ((c = get_collector(rb_thread_current())) != NULL && is_collector_enabled(c)) {
+      if ((c = get_collector(rb_thread_current())) != NULL) {
         RBASIC(obj)->flags |= ALLOCTRACK_OBJ_BIT;
         c->current_alloc++;
+        c->max_delta = MAX( c->current_alloc - c->current_free, c->max_delta);
 
         if (c->current_limit && (c->current_alloc - c->current_free) > c->current_limit) {
           c->limit_signal = 1;
@@ -212,8 +219,7 @@ tracepoint_hook(VALUE tpval, void *data)
       }
       break;
     case RUBY_INTERNAL_EVENT_FREEOBJ:
-      if ((c = get_collector(rb_thread_current())) != NULL && is_collector_enabled(c) &&
-          (RBASIC(obj)->flags & ALLOCTRACK_OBJ_BIT)) {
+      if ((c = get_collector(rb_thread_current())) != NULL && (RBASIC(obj)->flags & ALLOCTRACK_OBJ_BIT)) {
         c->current_free++;
       }
       break;
@@ -235,14 +241,22 @@ any_collectors_with_exceeded_limits()
 static void
 exception_tracepoint_hook(VALUE tpval, void *data)
 {
+  int should_raise = 0;
   VALUE th = rb_thread_current();
   stat_collector_t *c;
   if ((c = get_collector(th)) != NULL && is_collector_limit_exceeded(c)) {
-    remove_collector(th);
+    rb_gc(); /* try to gc before raising */
+    if ((c->current_alloc - c->current_free) > c->current_limit) {
+      remove_collector(th);
+      should_raise = 1;
+    } else {
+      c->limit_signal = 0;
+    }
     if (!any_collectors_with_exceeded_limits()) {
       rb_tracepoint_disable(tpval_exception);
     }
-    rb_raise(eAllocTrackLimitExceeded, "allocation limit exceeded");
+
+    if (should_raise) rb_raise(eAllocTrackLimitExceeded, "allocation limit exceeded");
   }
 }
 
@@ -258,6 +272,7 @@ Init_alloc_track()
   rb_define_singleton_method(mAllocTrack, "free", _free, 0);
   rb_define_singleton_method(mAllocTrack, "delta", delta, 0);
   rb_define_singleton_method(mAllocTrack, "limit", limit, 1);
+  rb_define_singleton_method(mAllocTrack, "max_delta", max_delta, 0);
 
   eAllocTrackError = rb_define_class_under(mAllocTrack, "Error", rb_eStandardError);
   eAllocTrackLimitExceeded = rb_define_class_under(mAllocTrack, "LimitExceeded", rb_eStandardError);

data/test/test_alloc_track.rb

@@ -19,6 +19,17 @@ class TestAllocTrack < Test::Unit::TestCase
     AllocTrack.stop
   end
 
+  def test_max_delta
+    AllocTrack.start
+    max_delta = 0
+    100.times do
+      Object.new
+      max_delta = [max_delta, AllocTrack.delta].max
+    end
+    assert (AllocTrack.max_delta - max_delta ).abs < 10 #close enough
+    AllocTrack.stop
+  end
+
   def test_thread_not_included
     AllocTrack.start
     t = Thread.new do
@@ -49,11 +60,22 @@ class TestAllocTrack < Test::Unit::TestCase
   end
 
   def test_limit_raises
+    vals = []
     assert_raise AllocTrack::LimitExceeded do
       AllocTrack.limit 10 do
+        200.times { vals.push(Object.new) }
+      end
+    end
+  end
+
+  def test_limit_invokes_gc
+    stat = GC.stat
+    assert_nothing_raised do
+      AllocTrack.limit 50 do
         200.times { Object.new }
       end
     end
+    assert_operator GC.stat[:count], :>, stat[:count]
   end
 
   def test_within_limit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alloc_track
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Scott Francis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler