allocation_tracer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21df296d813762ba6a5b3393ae95cbc09fa2560
-  data.tar.gz: 089e3fcaa7df385f58c91a3762d1c1f714cbb50a
+  metadata.gz: 5591d5370e3ce789b1f83038fb1a569d5d95df2f
+  data.tar.gz: 02e0ce857929fb00a7a05b2a4624a1ade3a9c634
 SHA512:
-  metadata.gz: a9f98fcbbd4a1e7cac48aaab69e10e9857b63050ffb8ec7e9d8ef9800d9668cfb2715ec2414ed277276edaf3ca53527f1606ec589656b71ea972d33d4a3d8765
-  data.tar.gz: 7d34cd7d37a60411664a82b94edb9b832cbe00a351c5b9b4da33adce9ee354b98f3f79d99ab594b6253675c1ffe4c6e3a3487052f4e7f7ba9ad586e823ff2f7d
+  metadata.gz: ea426ef389e777313fef152336f8c0fdee45710d192ec063ba9996edd2d3cff48a473593a19ee41b98312d70b78160a60edba741891f5ea1461ed9481ac03cd8
+  data.tar.gz: 8134ddefac4fb01ca99e0d7442cf1626e4e4a18802f80e5e1ed0f5d0abd3791976c72e88b32d5a52ea8fe411d44bbf4676b623966738f6d79d3c2f58a2897091

data/README.md

@@ -179,11 +179,11 @@ will show
 
 This output means that the age of 3434 T_OBJECT objects are 0, 96563 
 objects are 1 and 2 objects are 7. Also the age of 3435 T_STRING 
-objects are 0, 96556 are 1 and so on.
+objects are 0, 96556 objects are 1 and so on.
 
-Note that these number includes living objects and dead objects.  For 
-dead object, age means lifetime. For living objects, age means current 
-age.
+Note that these numbers includes living objects and dead objects.  For 
+dead objects, age means lifetime. For living objects, age means 
+current age.
 
 ## Contributing
 

data/ext/allocation_tracer/allocation_tracer.c

@@ -176,6 +176,19 @@ free_key_values_i(st_data_t key, st_data_t value, void *data)
     return ST_CONTINUE;
 }
 
+static void
+delete_lifetime_table(struct traceobj_arg *arg)
+{
+    int i;
+    if (arg->lifetime_table) {
+	for (i=0; i<T_MASK; i++) {
+	    free(arg->lifetime_table[i]);
+	}
+	free(arg->lifetime_table);
+	arg->lifetime_table = NULL;
+    }
+}
+
 static void
 clear_traceobj_arg(void)
 {
@@ -187,17 +200,8 @@ clear_traceobj_arg(void)
     st_clear(arg->object_table);
     st_foreach(arg->str_table, free_keys_i, 0);
     st_clear(arg->str_table);
-
-    if (arg->lifetime_table) {
-	int i;
-
-	for (i=0; i<T_MASK; i++) {
-	    if (arg->lifetime_table[i] != NULL) {
-		free(arg->lifetime_table[i]);
-		arg->lifetime_table[i] = NULL;
-	    }
-	}
-    }
+    arg->freed_allocation_info = 0;
+    delete_lifetime_table(arg);
 }
 
 static struct allocation_info *
@@ -316,11 +320,13 @@ aggregate_freed_info(void *data)
 
     arg->freed_allocation_info = NULL;
 
-    while (info) {
-	struct allocation_info *next_info = info->next;
-	aggregate_each_info(arg, info, gc_count);
-	free_allocation_info(arg, info);
-	info = next_info;
+    if (arg->running) {
+	while (info) {
+	    struct allocation_info *next_info = info->next;
+	    aggregate_each_info(arg, info, gc_count);
+	    free_allocation_info(arg, info);
+	    info = next_info;
+	}
     }
 }
 
@@ -340,9 +346,9 @@ add_lifetime_table(size_t **lines, int type, struct allocation_info *info)
 
     if (line == NULL) {
 	len = age + 1;
-	line = lines[type] = malloc(sizeof(size_t) * (1 + len));
+	line = lines[type] = calloc(1 + len, sizeof(size_t));
+	assert(line != NULL);
 	line[0] = len;
-	for (i=0; i<len; i++) line[i+1] = 0;
     }
     else {
 	len = line[0];
@@ -351,12 +357,18 @@ add_lifetime_table(size_t **lines, int type, struct allocation_info *info)
 	    size_t old_len = len;
 	    len = age + 1;
 	    line = lines[type] = realloc(line, sizeof(size_t) * (1 + len));
-	    for (i=old_len; i<len; i++) line[i+1] = 0;
+
+	    assert(line != NULL);
+
+	    for (i=old_len; i<len; i++) {
+		line[i+1] = 0;
+	    }
+
 	    line[0] = len;
 	}
     }
 
-    line[age + 1]++;
+    line[1 + age]++;
 }
 
 static void
@@ -467,7 +479,7 @@ stop_alloc_hooks(VALUE self)
 static VALUE
 type_sym(int type)
 {
-    static VALUE syms[T_MASK];
+    static VALUE syms[T_MASK] = {0};
 
     if (syms[0] == 0) {
 	int i;
@@ -501,6 +513,7 @@ type_sym(int type)
 		TYPE_NAME(T_DATA);
 	      default:
 		syms[i] = ID2SYM(rb_intern("unknown"));
+		break;
 #undef TYPE_NAME
 	    }
 	}
@@ -546,7 +559,6 @@ aggregate_result_i(st_data_t key, st_data_t val, void *data)
     }
     if (arg->keys & KEY_TYPE) {
 	int sym_index = key_buff->data[i++];
-	assert(T_MASK > sym_index);
 	rb_ary_push(k, type_sym(sym_index));
     }
     if (arg->keys & KEY_CLASS) {
@@ -646,6 +658,8 @@ aggregate_result(struct traceobj_arg *arg)
 	VALUE h = rb_hash_new();
 	int i;
 
+	rb_ivar_set(rb_mAllocationTracer, rb_intern("lifetime_table"), h);
+
 	for (i=0; i<T_MASK; i++) {
 	    size_t *line = arg->lifetime_table[i];
 
@@ -654,16 +668,15 @@ aggregate_result(struct traceobj_arg *arg)
 		VALUE ary = rb_ary_new();
 		VALUE sym = type_sym(i);
 
+		rb_hash_aset(h, sym, ary);
+
 		for (j=0; j<len; j++) {
 		    rb_ary_push(ary, SIZET2NUM(line[j+1]));
 		}
-
-		rb_hash_aset(h, sym, ary);
 	    }
 	}
 
 	st_foreach(arg->object_table, lifetime_table_for_live_objects_i, (st_data_t)h);
-	rb_ivar_set(rb_mAllocationTracer, rb_intern("lifetime_table"), h);
     }
 
     return aar.result;
@@ -805,15 +818,11 @@ allocation_tracer_lifetime_table_setup(VALUE self, VALUE set)
 
     if (RTEST(set)) {
 	if (arg->lifetime_table == NULL) {
-	    arg->lifetime_table = (size_t **)calloc(sizeof(size_t **), T_MASK);
-	    
+	    arg->lifetime_table = (size_t **)calloc(T_MASK, sizeof(size_t **));
 	}
     }
     else {
-	if (arg->lifetime_table != NULL) {
-	    free(arg->lifetime_table);
-	    arg->lifetime_table = NULL;
-	}
+	delete_lifetime_table(arg);
     }
 
     return Qnil;

data/lib/allocation_tracer/version.rb

@@ -1,3 +1,3 @@
 module ObjectSpace::AllocationTracer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/allocation_tracer.rb

@@ -2,5 +2,26 @@ require "allocation_tracer/version"
 require "allocation_tracer/allocation_tracer"
 
 module ObjectSpace::AllocationTracer
-  # Your code goes here...
+  def self.collect_lifetime_talbe
+    ObjectSpace::AllocationTracer.lifetime_table_setup true
+
+    if block_given?
+      begin
+        ObjectSpace::AllocationTracer.trace do
+          yield
+        end
+        ObjectSpace::AllocationTracer.lifetime_table
+      ensure
+        ObjectSpace::AllocationTracer.lifetime_table_setup false
+      end
+    else
+      ObjectSpace::AllocationTracer.trace
+    end
+  end
+
+  def self.collect_lifetime_talbe_stop
+    ObjectSpace::AllocationTracer.stop
+    result = ObjectSpace::AllocationTracer.lifetime_table
+    ObjectSpace::AllocationTracer.lifetime_table_setup false
+  end
 end

data/spec/allocation_tracer_spec.rb

@@ -188,7 +188,7 @@ describe ObjectSpace::AllocationTracer do
       expect(table[:T_NONE]).to be nil
     end
 
-    it 'should nil when ObjectSpace::AllocationTracer.lifetime_table_setup is nil' do
+    it 'should return nil when ObjectSpace::AllocationTracer.lifetime_table_setup is false' do
       ObjectSpace::AllocationTracer.lifetime_table_setup false
 
       ObjectSpace::AllocationTracer.trace do
@@ -202,5 +202,34 @@ describe ObjectSpace::AllocationTracer do
 
       expect(table).to be nil
     end
+
+    it 'should return nil getting it twice' do
+      ObjectSpace::AllocationTracer.trace do
+        100000.times{
+          Object.new
+          ''
+        }
+      end
+
+      table = ObjectSpace::AllocationTracer.lifetime_table
+      table = ObjectSpace::AllocationTracer.lifetime_table
+
+      expect(table).to be nil
+    end
+  end
+
+  describe 'ObjectSpace::AllocationTracer.collect_lifetime_talbe' do
+    it 'should collect lifetime table' do
+      table = ObjectSpace::AllocationTracer.collect_lifetime_talbe do
+        100000.times{
+          Object.new
+          ''
+        }
+      end
+
+      expect(table[:T_OBJECT].inject(&:+)).to be >= 10_000
+      expect(table[:T_STRING].inject(&:+)).to be >= 10_000
+      expect(table[:T_NONE]).to be nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: allocation_tracer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Koichi Sasada