heap_dump 0.0.26 → 0.0.27

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in heap_dump.gemspec
 gemspec

data/ext/heap_dump/heap_dump.c

@@ -68,6 +68,7 @@ static ID classid;
 #define yg_rstring(str) yg_string(RSTRING_PTR(str), (unsigned int)RSTRING_LEN(str))
 #define yg_int(i) yajl_gen_integer(ctx->yajl, i)
 #define yg_double(d) (yajl_gen_double(ctx->yajl, d)==yajl_gen_invalid_number? yg_cstring("inf|NaN") : true)
+#define yg_null() yajl_gen_null(ctx->yajl)
 
 //#define yg_id(obj) yg_int(NUM2LONG(rb_obj_id(obj)))
 #define yg_id(obj) yg_id1(obj,ctx)
@@ -507,7 +508,14 @@ static int dump_method_entry_i(ID key, const rb_method_entry_t *me, st_data_t da
 }
 
 static int dump_iv_entry(ID key, VALUE value, walk_ctx_t *ctx){
-  yg_cstring(rb_id2name(key));
+  const char* key_str = rb_id2name(key);
+  if(key_str)
+    yg_cstring(key_str);
+  else{
+    printf("Null key! %d\n", key);
+    yg_cstring("___null_key___");
+    //yg_null();
+  }
   yg_id(value);
   return ST_CONTINUE;
 }
@@ -1361,11 +1369,11 @@ static void dump_thread(const rb_thread_t* th, walk_ctx_t *ctx){
   }
 
   yg_cstring("local_storage");
-  yajl_gen_array_open(ctx->yajl);
+  yajl_gen_map_open(ctx->yajl);
   if(th->local_storage){
     st_foreach(th->local_storage, dump_iv_entry, (st_data_t)ctx); //?
   }
-  yajl_gen_array_close(ctx->yajl);
+  yajl_gen_map_close(ctx->yajl);
 
     // mark_event_hooks(th->event_hooks);
   rb_event_hook_t *hook = th->event_hooks;
@@ -1389,9 +1397,6 @@ static void dump_machine_context(walk_ctx_t *ctx){
   VALUE *stack_start, *stack_end;
 
 
-  yg_cstring("registers");
-  yajl_gen_array_open(ctx->yajl);
-
   FLUSH_REGISTER_WINDOWS;
   /* This assumes that all registers are saved into the jmp_buf (and stack) */
   rb_setjmp(save_regs_gc_mark.j);
@@ -1399,6 +1404,8 @@ static void dump_machine_context(walk_ctx_t *ctx){
   SET_STACK_END;
   GET_STACK_BOUNDS(stack_start, stack_end, 1);
 
+  yg_cstring("registers");
+  yajl_gen_array_open(ctx->yajl);
   //mark_locations_array(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v));
   VALUE* x = save_regs_gc_mark.v;
   unsigned long n = numberof(save_regs_gc_mark.v);

data/lib/heap_dump/version.rb

@@ -1,3 +1,3 @@
 module HeapDump
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heap_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger-ruby_core_source
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4211610270399320096
+      hash: -130654953779884601
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24