allocation_tracer 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7842f134236279f5daff085c04b6d213006d9c22
-  data.tar.gz: accc0258ea2a0f27859b9322fc9d244de413ff77
+  metadata.gz: cc70bffa355bef7e53d7dec123a601142634004e
+  data.tar.gz: e3d1ac0a14f14e890491aacb26601d9a4bdb564f
 SHA512:
-  metadata.gz: 5278e203b466d03ad3ed9af0229bcd3d0961f8657ceb7635253b3fe37854b23b6cd2e91821fc30ccbc96641fba334f9f219a247cb5d87bdc86ec9490dc345f11
-  data.tar.gz: 274eb069e103b48d9e6a99fbfbc99c7b416d244263008560c853a05dbd4ce878e70b636bdf0b6315b1e5583b21fb2c0fbb298caffd4beacba01df3f7284ef2a3
+  metadata.gz: d9b6df363aa685702c53a24386a76e6d1ea023e216551a4fe7e30a9df82722457857e84ed94d8ce17cdea3aacaa77c94578330be6350e12c1e68636af8a4939b
+  data.tar.gz: 028466e6747249427b595a0d106891cdbc93add1f4b0ca29e92f4512b47663800413743ad893ebfa90a8645aafafb9afc001aa9f3d5e35fad4fd2ebe151732f1

data/ext/allocation_tracer/allocation_tracer.c

@@ -13,6 +13,8 @@ size_t rb_obj_memsize_of(VALUE obj); /* in gc.c */
 static VALUE rb_mAllocationTracer;
 
 struct allocation_info {
+    struct allocation_info *next;
+
     /* all of information don't need marking. */
     int living;
     VALUE flags;
@@ -20,23 +22,26 @@ struct allocation_info {
     size_t generation;
     size_t memsize;
 
-    /* allocation info */
+    /* allocator info */
     const char *path;
     unsigned long line;
-
-    struct allocation_info *next;
 };
 
+#define MAX_KEY_DATA 4
+
 #define KEY_PATH    (1<<1)
 #define KEY_LINE    (1<<2)
 #define KEY_TYPE    (1<<3)
 #define KEY_CLASS   (1<<4)
 
+#define MAX_VAL_DATA 6
+
 #define VAL_COUNT     (1<<1)
-#define VAL_TOTAL_AGE (1<<2)
-#define VAL_MAX_AGE   (1<<3)
+#define VAL_OLDCOUNT  (1<<2)
+#define VAL_TOTAL_AGE (1<<3)
 #define VAL_MIN_AGE   (1<<4)
-#define VAL_MEMSIZE   (1<<5)
+#define VAL_MAX_AGE   (1<<5)
+#define VAL_MEMSIZE   (1<<6)
 
 struct traceobj_arg {
     int running;
@@ -101,12 +106,9 @@ delete_unique_str(st_table *tbl, const char *str)
     }
 }
 
-/* file, line, type */
-#define MAX_KEY_DATA 4
-
 struct memcmp_key_data {
     int n;
-    st_data_t data[4];
+    st_data_t data[MAX_KEY_DATA];
 };
 
 static int
@@ -218,9 +220,9 @@ newobj_i(VALUE tpval, void *data)
     }
 
     info->next = NULL;
+    info->flags = RBASIC(obj)->flags;
     info->living = 1;
     info->memsize = 0;
-    info->flags = RBASIC(obj)->flags;
     info->klass = RTEST(klass) ? rb_class_real(klass) : Qnil;
     info->generation = rb_gc_count();
 
@@ -276,10 +278,10 @@ aggregator_i(void *data)
 	    key = (st_data_t)key_buff;
 
 	    /* count, total age, max age, min age */
-	    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;
+	    val_buff = ALLOC_N(size_t, 6);
+	    val_buff[0] = val_buff[1] = val_buff[2] = 0;
+	    val_buff[3] = val_buff[4] = age;
+	    val_buff[5] = 0;
 
 	    if (arg->keys & KEY_PATH) keep_unique_str(arg->str_table, info->path);
 
@@ -290,10 +292,11 @@ aggregator_i(void *data)
 	}
 
 	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;
+	if (info->flags & FL_PROMOTED) val_buff[1] += 1;
+	val_buff[2] += age;
+	if (val_buff[3] > age) val_buff[3] = age; /* min */
+	if (val_buff[4] < age) val_buff[4] = age; /* max */
+	val_buff[5] += info->memsize;
 
 	free_allocation_info(arg, info);
 	info = next_info;
@@ -320,6 +323,7 @@ freeobj_i(VALUE tpval, void *data)
     }
 
     if (st_lookup(arg->object_table, (st_data_t)obj, (st_data_t *)&info)) {
+	info->flags = RBASIC(obj)->flags;
 	info->memsize = rb_obj_memsize_of(obj);
 	move_to_freed_list(arg, info);
 	st_delete(arg->object_table, (st_data_t *)&obj, (st_data_t *)&info);
@@ -393,7 +397,10 @@ aggregate_result_i(st_data_t key, st_data_t val, void *data)
 
     size_t *val_buff = (size_t *)val;
     struct memcmp_key_data *key_buff = (struct memcmp_key_data *)key;
-    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 v = rb_ary_new3(6,
+			  INT2FIX(val_buff[0]), INT2FIX(val_buff[1]),
+			  INT2FIX(val_buff[2]), INT2FIX(val_buff[3]),
+			  INT2FIX(val_buff[4]), INT2FIX(val_buff[5]));
     VALUE k = rb_ary_new();
     int i = 0;
     static VALUE type_symbols[T_MASK] = {0};
@@ -445,7 +452,14 @@ 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;
+    VALUE obj = (VALUE)key;
+
+    if ((info->flags & T_MASK) == (RBASIC(obj)->flags & T_MASK)) {
+	info->flags = RBASIC(obj)->flags;
+    }
+    /* danger operation because obj can be collected. */
     move_to_freed_list(arg, info);
+
     return ST_CONTINUE;
 }
 
@@ -553,11 +567,11 @@ allocation_tracer_header(VALUE self)
     if (arg->keys & KEY_CLASS) rb_ary_push(ary, ID2SYM(rb_intern("class")));
 
     if (arg->vals & VAL_COUNT) rb_ary_push(ary, ID2SYM(rb_intern("count")));
+    if (arg->vals & VAL_OLDCOUNT) rb_ary_push(ary, ID2SYM(rb_intern("old_count")));
     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")));
-
+    if (arg->vals & VAL_MAX_AGE) rb_ary_push(ary, ID2SYM(rb_intern("max_age")));
+    if (arg->vals & VAL_MEMSIZE) rb_ary_push(ary, ID2SYM(rb_intern("total_memsize")));
     return ary;
 }
 

data/lib/allocation_tracer/version.rb

@@ -1,3 +1,3 @@
 module ObjectSpace::AllocationTracer
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 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, 0]
+      expect(result[[__FILE__, line]]).to eq [1, 0, 0, 0, 0, 0]
     end
 
     it 'should run twice' do
@@ -19,9 +19,23 @@ describe ObjectSpace::AllocationTracer do
       result = ObjectSpace::AllocationTracer.trace do
         Object.new
       end
+      #GC.start
+      # p result
+      expect(result.length).to be >= 1
+      expect(result[[__FILE__, line]]).to eq [1, 0, 0, 0, 0, 0]
+    end
+
+    it 'should count old objects' do
+      a = nil
+      line = __LINE__ + 2
+      result = ObjectSpace::AllocationTracer.trace do
+        a = 'x' # it will be old object
+        32.times{GC.start}
+      end
 
       expect(result.length).to be >= 1
-      expect(result[[__FILE__, line]]).to eq [1, 0, 0, 0, 0]
+      _, old_count, * = *result[[__FILE__, line]]
+      expect(old_count).to be == 1
     end
 
     it 'should acquire allocated memsize' do
@@ -32,7 +46,8 @@ describe ObjectSpace::AllocationTracer do
       end
 
       expect(result.length).to be >= 1
-      expect(result[[__FILE__, line]][-1]).to be > 1234
+      size = result[[__FILE__, line]][-1]
+      expect(size).to be > 1234 if size > 0
     end
 
     describe 'with different setup' do
@@ -45,11 +60,11 @@ describe ObjectSpace::AllocationTracer do
         end
 
         expect(result.length).to be 5
-        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, :T_OBJECT]]).to eq [1, 0, 0, 0, 0, 0]
+        expect(result[[__FILE__, line, :T_ARRAY]]).to eq [1, 0, 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]
+        expect(result[[__FILE__, line + 1, :T_OBJECT]]).to eq [1, 0, 0, 0, 0, 0]
+        expect(result[[__FILE__, line + 1, :T_STRING]]).to eq [1, 0, 0, 0, 0, 0]
       end
 
       it 'should work with class' do
@@ -61,11 +76,11 @@ describe ObjectSpace::AllocationTracer do
         end
 
         expect(result.length).to be 5
-        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]
+        expect(result[[__FILE__, line, Object]]).to eq [1, 0, 0, 0, 0, 0]
+        expect(result[[__FILE__, line, Array]]).to eq [1, 0, 0, 0, 0, 0]
+        # expect(result[[__FILE__, line + 1, Hash]]).to eq [1, 0, 0, 0, 0, 0]
+        expect(result[[__FILE__, line + 1, Object]]).to eq [1, 0, 0, 0, 0, 0]
+        expect(result[[__FILE__, line + 1, String]]).to eq [1, 0, 0, 0, 0, 0]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allocation_tracer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler