heap_dump 0.0.11 → 0.0.12

data/ext/heap_dump/heap_dump.c

@@ -520,6 +520,32 @@ static void dump_iseq(const rb_iseq_t* iseq, walk_ctx_t *ctx){
   }
 }
 
+static void dump_block(const rb_block_t* block, walk_ctx_t *ctx){
+    // VALUE self;     /* share with method frame if it's only block */
+    // VALUE *lfp;     /* share with method frame if it's only block */
+    // VALUE *dfp;     /* share with method frame if it's only block */
+    // rb_iseq_t *iseq;
+    // VALUE proc;
+
+  if(block->iseq && !RUBY_VM_IFUNC_P(block->iseq)) {
+      yg_cstring("iseq");
+      yajl_gen_map_open(ctx->yajl);
+      //FIXME: id may be different (due to RBasic fields)!!!
+      ygh_id("id", block->iseq);
+      dump_iseq(block->iseq, ctx);
+      yajl_gen_map_close(ctx->yajl);
+    } else {
+      ygh_id("iseq", block->iseq);
+    }
+
+  ygh_id("self", block->self);
+
+  ygh_id("lfp", block->lfp);
+  ygh_id("dfp", block->dfp);
+  //lfp = local frame pointer? local_num elems?
+  // dfp = ?
+}
+
 
 static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
 
@@ -535,6 +561,8 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
   // proc <-
   // thgroup
   // time
+  // barrier
+  // strio
   // etc...
 
   const char* typename = RTYPEDDATA_TYPE(obj)->wrap_struct_name;
@@ -545,6 +573,20 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     return;
   }
 
+  if(!strcmp("autoload", typename)){
+    const st_table *tbl = RTYPEDDATA_DATA(obj);
+    yg_cstring("val");
+    yajl_gen_map_open(ctx->yajl);
+    st_foreach(tbl, dump_method_entry_i, (st_data_t)ctx);
+    yajl_gen_map_close(ctx->yajl);
+    return;
+  }
+
+  if(!strcmp("barrier", typename)){
+    ygh_id("val", (VALUE)RTYPEDDATA_DATA(obj));
+    return;
+  }
+
   if(!strcmp("proc", typename)){
     const rb_proc_t *proc = RTYPEDDATA_DATA(obj);
     ygh_int("is_lambda", proc->is_lambda);
@@ -553,16 +595,10 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     //TODO: dump refs from env here (they're dumped in env itself, but just to make analysis easier)?
 
     //TODO: is this proc->block.iseq sometimes bound somewhere (seems to be not, but dupes exist)
-    if(proc->block.iseq && !RUBY_VM_IFUNC_P(proc->block.iseq)) {
-      yg_cstring("iseq");
-      yajl_gen_map_open(ctx->yajl);
-      //FIXME: id may be different (due to RBasic fields)!!!
-      ygh_id("id", proc->block.iseq);
-      dump_iseq(proc->block.iseq, ctx);
-      yajl_gen_map_close(ctx->yajl);
-    } else {
-      ygh_id("iseq", proc->block.iseq);
-    }
+    yg_cstring("block");
+    yajl_gen_map_open(ctx->yajl);
+    dump_block(&proc->block, ctx);
+    yajl_gen_map_close(ctx->yajl);
     return;
   }
 
@@ -596,11 +632,19 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
   if(!strcmp("VM/env", typename)){
     const rb_env_t* env = RTYPEDDATA_DATA(obj);
     int i = 0;
-    yg_cstring("refs");
+    yg_cstring("env");
     yajl_gen_array_open(ctx->yajl);
     for(; i < env->env_size; i++)
       yg_id(env->env[i]);
     yajl_gen_array_close(ctx->yajl);
+
+    ygh_int("local_size", env->local_size);
+    ygh_id("prev_envval", env->prev_envval);
+
+    yg_cstring("block");
+    yajl_gen_map_open(ctx->yajl);
+    dump_block(&env->block, ctx);
+    yajl_gen_map_close(ctx->yajl);
     return;
   }
 
@@ -608,6 +652,7 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     const rb_vm_t *vm = RTYPEDDATA_DATA(obj);
 
     ygh_id("thgroup_default", vm->thgroup_default);
+    // rb_gc_register_mark_object - goes in that array (not to be freed until vm dies)
     ygh_id("mark_object_ary", vm->mark_object_ary);
     ygh_id("load_path", vm->load_path);
     ygh_id("loaded_features", vm->loaded_features);

data/lib/heap_dump/version.rb

@@ -1,3 +1,3 @@
 module HeapDump
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heap_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-internal
-  requirement: &70360524817500 !ruby/object:Gem::Requirement
+  requirement: &70353553846140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70360524817500
+  version_requirements: *70353553846140
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70360524816940 !ruby/object:Gem::Requirement
+  requirement: &70353553845660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70360524816940
+  version_requirements: *70353553845660
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70360524816540 !ruby/object:Gem::Requirement
+  requirement: &70353553845240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360524816540
+  version_requirements: *70353553845240
 description: dump ruby 1.9 heap contents
 email:
 - vasilyfedoseyev@gmail.com