allocation_tracer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f129686d0942e7690ff66568f9af7f50f11148
-  data.tar.gz: fbc17e5b8358996aa55843c8632e15896d14f16d
+  metadata.gz: 76c7a52b186ed762bc19644997b2d57e66fbb431
+  data.tar.gz: 2b945274f4255f0c06374354a66bde0d0f3bcf13
 SHA512:
-  metadata.gz: 886adb15a4f94f3fd9ed2815f9aee9fa524bf48aa853ceafb9bf2ff450a5dcd204ce8b8c483029ba78d1bc81f2124e7bb6662770d253e2aed58262c24a54e8ad
-  data.tar.gz: 69b0c17158f3f8af672296a4868c609a2f12c0c8b8d10d08b7d2309c6357b35b2b9f843986594c62bfad1549a62aeae12f90e9cfe3db3c299ee59f5001b07b00
+  metadata.gz: 518dcab890b67dab01d987ef98a277c7364521777c5c9edef0057543cc34719a369ceec93d81c020dd96700894c0da3aeb582d2b19720e7b3fc5899f26543e18
+  data.tar.gz: 6b7792f6f02388a69d4fb21a92b2cb9c94605125db49c14af5821fd5700c5be99b2b892c646300030130b25fad4b320a33bb65f100d50c7fe8ac92e9fee4cd86

data/ext/allocation_tracer/allocation_tracer.c

@@ -8,6 +8,8 @@
 #include "ruby/ruby.h"
 #include "ruby/debug.h"
 
+size_t rb_obj_memsize_of(VALUE obj); /* in gc.c */
+
 static VALUE rb_mAllocationTracer;
 
 struct allocation_info {
@@ -16,6 +18,7 @@ struct allocation_info {
     VALUE flags;
     VALUE klass;
     size_t generation;
+    size_t memsize;
 
     /* allocation info */
     const char *path;
@@ -33,6 +36,7 @@ struct allocation_info {
 #define VAL_TOTAL_AGE (1<<2)
 #define VAL_MAX_AGE   (1<<3)
 #define VAL_MIN_AGE   (1<<4)
+#define VAL_MEMSIZE   (1<<5)
 
 struct traceobj_arg {
     int running;
@@ -133,7 +137,7 @@ get_traceobj_arg(void)
 	tmp_trace_arg = ALLOC_N(struct traceobj_arg, 1);
 	tmp_trace_arg->running = 0;
 	tmp_trace_arg->keys = 0;
-	tmp_trace_arg->vals = VAL_COUNT | VAL_TOTAL_AGE | VAL_MAX_AGE | VAL_MIN_AGE;
+	tmp_trace_arg->vals = VAL_COUNT | VAL_TOTAL_AGE | VAL_MAX_AGE | VAL_MIN_AGE | VAL_MEMSIZE;
 	tmp_trace_arg->aggregate_table = st_init_table(&memcmp_hash_type);
 	tmp_trace_arg->object_table = st_init_numtable();
 	tmp_trace_arg->str_table = st_init_strtable();
@@ -199,6 +203,7 @@ newobj_i(VALUE tpval, void *data)
     VALUE obj = rb_tracearg_object(tparg);
     VALUE path = rb_tracearg_path(tparg);
     VALUE line = rb_tracearg_lineno(tparg);
+    VALUE klass = RBASIC_CLASS(obj);
     const char *path_cstr = RTEST(path) ? make_unique_str(arg->str_table, RSTRING_PTR(path), RSTRING_LEN(path)) : NULL;
 
     if (st_lookup(arg->object_table, (st_data_t)obj, (st_data_t *)&info)) {
@@ -215,7 +220,7 @@ newobj_i(VALUE tpval, void *data)
     info->next = NULL;
     info->living = 1;
     info->flags = RBASIC(obj)->flags;
-    info->klass = rb_class_real(RBASIC_CLASS(obj));
+    info->klass = RTEST(klass) ? rb_class_real(klass) : Qnil;
     info->generation = rb_gc_count();
 
     info->path = path_cstr;
@@ -240,8 +245,8 @@ aggregator_i(void *data)
 	struct allocation_info *next_info = info->next;
 	st_data_t key, val;
 	struct memcmp_key_data key_data;
-	int *val_buff;
-	int age = (int)(gc_count - info->generation);
+	size_t *val_buff;
+	size_t age = (int)(gc_count - info->generation);
 	int i;
 
 	i = 0;
@@ -270,22 +275,24 @@ aggregator_i(void *data)
 	    key = (st_data_t)key_buff;
 
 	    /* count, total age, max age, min age */
-	    val_buff = ALLOC_N(int, 4);
+	    val_buff = ALLOC_N(size_t, 5);
 	    val_buff[0] = val_buff[1] = 0;
 	    val_buff[2] = val_buff[3] = age;
+	    val_buff[4] = 0;
 
 	    if (arg->keys & KEY_PATH) keep_unique_str(arg->str_table, info->path);
 
 	    st_insert(arg->aggregate_table, (st_data_t)key_buff, (st_data_t)val_buff);
 	}
 	else {
-	    val_buff = (int *)val;
+	    val_buff = (size_t *)val;
 	}
 
 	val_buff[0] += 1;
 	val_buff[1] += age;
 	if (val_buff[2] > age) val_buff[2] = age;
 	if (val_buff[3] < age) val_buff[3] = age;
+	val_buff[4] += info->memsize;
 
 	free_allocation_info(arg, info);
 	info = next_info;
@@ -293,8 +300,9 @@ aggregator_i(void *data)
 }
 
 static void
-move_to_freed_list(struct traceobj_arg *arg, struct allocation_info *info)
+move_to_freed_list(struct traceobj_arg *arg, VALUE obj, struct allocation_info *info)
 {
+    info->memsize = rb_obj_memsize_of(obj);
     info->next = arg->freed_allocation_info;
     arg->freed_allocation_info = info;
 }
@@ -312,7 +320,7 @@ freeobj_i(VALUE tpval, void *data)
     }
 
     if (st_lookup(arg->object_table, (st_data_t)obj, (st_data_t *)&info)) {
-	move_to_freed_list(arg, info);
+	move_to_freed_list(arg, obj, info);
 	st_delete(arg->object_table, (st_data_t *)&obj, (st_data_t *)&info);
     }
 }
@@ -382,9 +390,9 @@ aggregate_result_i(st_data_t key, st_data_t val, void *data)
     struct traceobj_arg *arg = aar->arg;
     VALUE result = aar->result;
 
-    int *val_buff = (int *)val;
+    size_t *val_buff = (size_t *)val;
     struct memcmp_key_data *key_buff = (struct memcmp_key_data *)key;
-    VALUE v = rb_ary_new3(4, INT2FIX(val_buff[0]), INT2FIX(val_buff[1]), INT2FIX(val_buff[2]), INT2FIX(val_buff[3]));
+    VALUE v = rb_ary_new3(5, INT2FIX(val_buff[0]), INT2FIX(val_buff[1]), INT2FIX(val_buff[2]), INT2FIX(val_buff[3]), INT2FIX(val_buff[4]));
     VALUE k = rb_ary_new();
     int i = 0;
     static VALUE type_symbols[T_MASK] = {0};
@@ -415,7 +423,7 @@ aggregate_result_i(st_data_t key, st_data_t val, void *data)
     }
     if (arg->keys & KEY_CLASS) {
 	VALUE klass = key_buff->data[i++];
-	if (BUILTIN_TYPE(klass) == T_CLASS) {
+	if (RTEST(klass) && BUILTIN_TYPE(klass) == T_CLASS) {
 	    klass = rb_class_real(klass);
 	    rb_ary_push(k, klass);
 	    /* TODO: actually, it is dangerous code because klass can be sweeped */
@@ -436,7 +444,7 @@ aggregate_rest_object_i(st_data_t key, st_data_t val, void *data)
 {
     struct traceobj_arg *arg = (struct traceobj_arg *)data;
     struct allocation_info *info = (struct allocation_info *)val;
-    move_to_freed_list(arg, info);
+    move_to_freed_list(arg, (VALUE)key, info);
     return ST_CONTINUE;
 }
 
@@ -547,6 +555,7 @@ allocation_tracer_header(VALUE self)
     if (arg->vals & VAL_TOTAL_AGE) rb_ary_push(ary, ID2SYM(rb_intern("total_age")));
     if (arg->vals & VAL_MAX_AGE) rb_ary_push(ary, ID2SYM(rb_intern("max_age")));
     if (arg->vals & VAL_MIN_AGE) rb_ary_push(ary, ID2SYM(rb_intern("min_age")));
+    if (arg->vals & VAL_MEMSIZE) rb_ary_push(ary, ID2SYM(rb_intern("memsize")));
 
     return ary;
 }

data/lib/allocation_tracer/version.rb

@@ -1,3 +1,3 @@
 module ObjectSpace::AllocationTracer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/allocation_tracer_spec.rb

@@ -11,7 +11,7 @@ describe ObjectSpace::AllocationTracer do
       end
 
       expect(result.length).to be >= 1
-      expect(result[[__FILE__, line]]).to eq [1, 0, 0, 0]
+      expect(result[[__FILE__, line]]).to eq [1, 0, 0, 0, 0]
     end
 
     it 'should run twice' do
@@ -21,7 +21,17 @@ describe ObjectSpace::AllocationTracer do
       end
 
       expect(result.length).to be >= 1
-      expect(result[[__FILE__, line]]).to eq [1, 0, 0, 0]
+      expect(result[[__FILE__, line]]).to eq [1, 0, 0, 0, 0]
+    end
+
+    it 'should acquire allocated memsize' do
+      line = __LINE__ + 2
+      result = ObjectSpace::AllocationTracer.trace do
+        a = 'x' * 1234
+      end
+
+      expect(result.length).to be >= 1
+      expect(result[[__FILE__, line]][-1]).to be > 1234
     end
 
     describe 'with different setup' do
@@ -34,11 +44,11 @@ describe ObjectSpace::AllocationTracer do
         end
 
         expect(result.length).to be 5
-        expect(result[[__FILE__, line, :T_OBJECT]]).to eq [1, 0, 0, 0]
-        expect(result[[__FILE__, line, :T_ARRAY]]).to eq [1, 0, 0, 0]
-        expect(result[[__FILE__, line + 1, :T_HASH]]).to eq [1, 0, 0, 0]
-        expect(result[[__FILE__, line + 1, :T_OBJECT]]).to eq [1, 0, 0, 0]
-        expect(result[[__FILE__, line + 1, :T_STRING]]).to eq [1, 0, 0, 0]
+        expect(result[[__FILE__, line, :T_OBJECT]]).to eq [1, 0, 0, 0, 0]
+        expect(result[[__FILE__, line, :T_ARRAY]]).to eq [1, 0, 0, 0, 0]
+        # expect(result[[__FILE__, line + 1, :T_HASH]]).to eq [1, 0, 0, 0, 0]
+        expect(result[[__FILE__, line + 1, :T_OBJECT]]).to eq [1, 0, 0, 0, 0]
+        expect(result[[__FILE__, line + 1, :T_STRING]]).to eq [1, 0, 0, 0, 0]
       end
 
       it 'should work with class' do
@@ -50,11 +60,11 @@ describe ObjectSpace::AllocationTracer do
         end
 
         expect(result.length).to be 5
-        expect(result[[__FILE__, line, Object]]).to eq [1, 0, 0, 0]
-        expect(result[[__FILE__, line, Array]]).to eq [1, 0, 0, 0]
-        expect(result[[__FILE__, line + 1, Hash]]).to eq [1, 0, 0, 0]
-        expect(result[[__FILE__, line + 1, Object]]).to eq [1, 0, 0, 0]
-        expect(result[[__FILE__, line + 1, String]]).to eq [1, 0, 0, 0]
+        expect(result[[__FILE__, line, Object]]).to eq [1, 0, 0, 0, 0]
+        expect(result[[__FILE__, line, Array]]).to eq [1, 0, 0, 0, 0]
+        # expect(result[[__FILE__, line + 1, Hash]]).to eq [1, 0, 0, 0, 0]
+        expect(result[[__FILE__, line + 1, Object]]).to eq [1, 0, 0, 0, 0]
+        expect(result[[__FILE__, line + 1, String]]).to eq [1, 0, 0, 0, 0]
       end
     end
   end

metadata

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