heap_dump 0.0.3 → 0.0.4

data/ext/heap_dump/heap_dump.c

@@ -385,13 +385,13 @@ dump_keyvalue(st_data_t key, st_data_t value, walk_ctx_t *ctx){
 }
 
 static void dump_hash(VALUE obj, walk_ctx_t* ctx){
-  yg_cstring("refs");
-  yajl_gen_array_open(ctx->yajl);
+  yg_cstring("val");
+  yajl_gen_map_open(ctx->yajl);
   if(RHASH_SIZE(obj) > 0){
     //TODO: mark keys and values separately?
     st_foreach(RHASH(obj)->ntbl, dump_keyvalue, (st_data_t)ctx);
   }
-  yajl_gen_array_close(ctx->yajl);
+  yajl_gen_map_close(ctx->yajl);
 }
 
 static int dump_method_entry_i(ID key, const rb_method_entry_t *me, st_data_t data){
@@ -529,16 +529,16 @@ void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     ygh_id("envval", proc->envval);
     //TODO: dump refs from env here (they're dumped in env itself, but just to make analysis easier)?
 
-    //TODO: is this proc->block.iseq bound somewhere else? probably not
-    // if(proc->block.iseq && !RUBY_VM_IFUNC_P(proc->block.iseq)) {
-    //   yg_cstring("iseq");
-    //   yajl_gen_map_open(ctx->yajl);
-    //   ygh_id("id", proc->block.iseq);
-    //   dump_iseq(proc->block.iseq, ctx);
-    //   yajl_gen_map_close(ctx->yajl);
-    // } else {
+    //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);
+      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);
-    // }
+    }
     return;
   }
 
@@ -599,7 +599,7 @@ static inline void walk_live_object(VALUE obj, walk_ctx_t *ctx){
 
     case T_ARRAY:
       // if (FL_TEST(obj, ELTS_SHARED)) ...
-      yg_cstring("refs");
+      yg_cstring("val");
       yajl_gen_array_open(ctx->yajl);
       {
       long i, len = RARRAY_LEN(obj);

data/lib/heap_dump/version.rb

@@ -1,3 +1,3 @@
 module HeapDump
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heap_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-internal
-  requirement: &70147118245260 !ruby/object:Gem::Requirement
+  requirement: &70189318215520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70147118245260
+  version_requirements: *70189318215520
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70147118244680 !ruby/object:Gem::Requirement
+  requirement: &70189318214960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70147118244680
+  version_requirements: *70189318214960
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70147118244180 !ruby/object:Gem::Requirement
+  requirement: &70189318214460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147118244180
+  version_requirements: *70189318214460
 description: dump ruby 1.9 heap contents
 email:
 - vasilyfedoseyev@gmail.com