heap_dump 0.0.2 → 0.0.3

data/ext/heap_dump/heap_dump.c

@@ -434,7 +434,8 @@ static int dump_method_entry_i(ID key, const rb_method_entry_t *me, st_data_t da
   return ST_CONTINUE;
 }
 
-static int dump_iv_entry(st_data_t key, VALUE value, walk_ctx_t *ctx){
+static int dump_iv_entry(ID key, VALUE value, walk_ctx_t *ctx){
+  yg_cstring(rb_id2name(key));
   yg_id(value);
   return ST_CONTINUE;
 }
@@ -626,14 +627,18 @@ static inline void walk_live_object(VALUE obj, walk_ctx_t *ctx){
     case T_OBJECT:
       yg_cstring("class");
       yg_id(rb_class_of(obj));
-      yg_cstring("refs"); //ivars
-      yajl_gen_array_open(ctx->yajl);
-      {
-      long i, len = ROBJECT_NUMIV(obj);
-      VALUE *ptr = ROBJECT_IVPTR(obj);
-      for (i = 0; i < len; i++) yg_id(*ptr++);
-      }
-      yajl_gen_array_close(ctx->yajl);
+      // yg_cstring("refs"); //ivars
+      // yajl_gen_array_open(ctx->yajl);
+      // {
+      // long i, len = ROBJECT_NUMIV(obj);
+      // VALUE *ptr = ROBJECT_IVPTR(obj);
+      // for (i = 0; i < len; i++) yg_id(*ptr++);
+      // }
+      // yajl_gen_array_close(ctx->yajl);
+      yg_cstring("ivs");
+      yajl_gen_map_open(ctx->yajl); //TODO: what are iv keys?
+      rb_ivar_foreach(obj, dump_iv_entry, (st_data_t)ctx);
+      yajl_gen_map_close(ctx->yajl);
       break;
 
     case T_ICLASS:
@@ -660,10 +665,10 @@ static inline void walk_live_object(VALUE obj, walk_ctx_t *ctx){
 
       if (RCLASS_EXT(obj)){
         if(RCLASS_IV_TBL(obj) && RCLASS_IV_TBL(obj)->num_entries > 0){
-          yg_cstring("refs");
-          yajl_gen_array_open(ctx->yajl); //TODO: what are iv keys?
+          yg_cstring("ivs");
+          yajl_gen_map_open(ctx->yajl); //TODO: what are iv keys?
           st_foreach(RCLASS_IV_TBL(obj), dump_iv_entry, (st_data_t)ctx);
-          yajl_gen_array_close(ctx->yajl);
+          yajl_gen_map_close(ctx->yajl);
         }
 
         #if 0

data/lib/heap_dump/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heap_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   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: &70106505219640 !ruby/object:Gem::Requirement
+  requirement: &70147118245260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70106505219640
+  version_requirements: *70147118245260
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70106505219140 !ruby/object:Gem::Requirement
+  requirement: &70147118244680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70106505219140
+  version_requirements: *70147118244680
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70106505218720 !ruby/object:Gem::Requirement
+  requirement: &70147118244180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106505218720
+  version_requirements: *70147118244180
 description: dump ruby 1.9 heap contents
 email:
 - vasilyfedoseyev@gmail.com