heap_dump 0.0.16 → 0.0.17

data/Rakefile

@@ -9,6 +9,19 @@ desc "Simple dump test,just to check if extension compiles and does not segfault
 task :test => :compile do
   require "bundler/setup"
   require 'heap_dump'
+
+  def some_meth
+    fiber_var = :some_fiber_var2
+    Fiber.yield
+    aaa
+  end
+
+  Fiber.new{
+      fiber_var = :some_fiber_var
+      some_meth
+      Fiber.yield
+      fiber_var = :some_fiber_var3
+    }.resume
   puts "Dumping..."
   HeapDump.dump
 end

data/ext/heap_dump/heap_dump.c

@@ -606,7 +606,6 @@ typedef struct rb_fiber_struct {
 
 
 
-
 static void yg_fiber_status(enum fiber_status status, walk_ctx_t* ctx){
   switch(status){
     case CREATED: yg_cstring("CREATED"); break;
@@ -615,104 +614,28 @@ static void yg_fiber_status(enum fiber_status status, walk_ctx_t* ctx){
   }
 }
 
-
-
-static void dump_thread(rb_thread_t* th, walk_ctx_t *ctx){
-   if(th->stack){
-    VALUE *p = th->stack;
-    VALUE *sp = th->cfp->sp;
-    rb_control_frame_t *cfp = th->cfp;
-    rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
-
-    yg_cstring("stack");
-    yajl_gen_array_open(ctx->yajl);
-    while (p < sp) yg_id(*p++);
-    yajl_gen_array_close(ctx->yajl);
-
-    yg_cstring("cfp");
-    yajl_gen_array_open(ctx->yajl);
-    while (cfp != limit_cfp) {
-      yajl_gen_map_open(ctx->yajl);
-      rb_iseq_t *iseq = cfp->iseq;
-      ygh_id("proc", cfp->proc);
-      ygh_id("self", cfp->self);
-      if (iseq) {
-          ygh_id("iseq", RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq);
-          int line_no = rb_vm_get_sourceline(cfp);
-          ygh_rstring("file", iseq->filename);
-          ygh_int("line_no",line_no);
-      }
-      if (cfp->me){
-        const rb_method_entry_t *me = cfp->me;
-        //((rb_method_entry_t *)cfp->me)->mark = 1;
-        yg_cstring("me");
-        yajl_gen_map_open(ctx->yajl);
-        //
-        //rb_method_flag_t flag;
-     //   char mark;
-        //rb_method_definition_t *def;
-        ygh_id("klass", me->klass);
-        ID id = me->called_id;
-
-        if(me->def){
-          id = me->def->original_id;
-          yg_cstring("def");
-          dump_method_definition_as_value(me->def, ctx);
-        }
-        if(id != ID_ALLOCATOR)
-          ygh_rstring("meth_id", rb_id2str(id));
-        yajl_gen_map_close(ctx->yajl);
-      }
-      cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
-      yajl_gen_map_close(ctx->yajl);
-    }
-    yajl_gen_array_close(ctx->yajl);
-  }
-
-  //TODO: mark other...
-  ygh_id("first_proc", th->first_proc);
-  if (th->first_proc) ygh_id("first_proc", th->first_args);
-
-  ygh_id("thgroup", th->thgroup);
-  ygh_id("value", th->value);
-  ygh_id("errinfo", th->errinfo);
-  ygh_id("thrown_errinfo", th->thrown_errinfo);
-  ygh_id("local_svar", th->local_svar);
-  ygh_id("top_self", th->top_self);
-  ygh_id("top_wrapper", th->top_wrapper);
-  ygh_id("fiber", th->fiber);
-  ygh_id("root_fiber", th->root_fiber);
-  ygh_id("stat_insn_usage", th->stat_insn_usage);
-  ygh_id("last_status", th->last_status);
-  ygh_id("locking_mutex", th->locking_mutex);
-
-    // rb_mark_tbl(th->local_storage);
-
-    // if (GET_THREAD() != th && th->machine_stack_start && th->machine_stack_end) {
-    //     rb_gc_mark_machine_stack(th);
-    //     rb_gc_mark_locations((VALUE *)&th->machine_regs,
-    //        (VALUE *)(&th->machine_regs) +
-    //        sizeof(th->machine_regs) / sizeof(VALUE));
-    // }
-
-  yg_cstring("local_storage");
-  yajl_gen_array_open(ctx->yajl);
-  if(th->local_storage){
-    st_foreach(th->local_storage, dump_iv_entry, ctx); //?
+static void yg_fiber_type(enum context_type status, walk_ctx_t* ctx){
+  switch(status){
+    case CONTINUATION_CONTEXT: yg_cstring("CONTINUATION_CONTEXT"); break;
+    case FIBER_CONTEXT: yg_cstring("FIBER_CONTEXT"); break;
+    case ROOT_FIBER_CONTEXT: yg_cstring("ROOT_FIBER_CONTEXT"); break;
   }
-  yajl_gen_array_close(ctx->yajl);
+}
 
-    // mark_event_hooks(th->event_hooks);
-  rb_event_hook_t *hook = th->event_hooks;
-  yg_cstring("event_hooks");
-  yajl_gen_array_open(ctx->yajl);
-  while(hook){
-    yg_id(hook->data);
-    hook = hook->next;
+static void dump_locations(VALUE* p, int n, walk_ctx_t *ctx){
+  if(n > 0){
+    VALUE* x = p;
+    while(n--){
+      VALUE v = *x;
+      if(is_pointer_to_heap(v, NULL)) //TODO: sometimes thread is known, may get its th->vm->objspace (in case there's a few)
+        yg_id(v);
+      x++;
+    }
   }
-  yajl_gen_array_close(ctx->yajl);
 }
 
+static void dump_thread(rb_thread_t* th, walk_ctx_t *ctx);
+
 
 
 static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
@@ -851,11 +774,14 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     rb_fiber_t *fib = RTYPEDDATA_DATA(obj);
     ygh_id("prev", fib->prev);
     //ygh_int("cont", fib->cont);
+    yg_cstring("status");
+    yg_fiber_status(fib->status, ctx);
+
     yg_cstring("cont");
     yg_map();
       //ygh_int("type", fib->cont.type);
       yg_cstring("type");
-      yg_fiber_status(fib->cont.type, ctx);
+      yg_fiber_type(fib->cont.type, ctx);
 
       ygh_id("self", fib->cont.self);
       ygh_id("value", fib->cont.value);
@@ -1466,6 +1392,113 @@ is_pointer_to_heap(void *ptr, void* osp)
     return FALSE;
 }
 
+static void dump_thread(rb_thread_t* th, walk_ctx_t *ctx){
+   if(th->stack){
+    VALUE *p = th->stack;
+    VALUE *sp = th->cfp->sp;
+    rb_control_frame_t *cfp = th->cfp;
+    rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
+
+    yg_cstring("stack");
+    yajl_gen_array_open(ctx->yajl);
+    while (p < sp) yg_id(*p++);
+    yajl_gen_array_close(ctx->yajl);
+    yg_cstring("stack_locations");
+    yg_array();
+    dump_locations(p, th->mark_stack_len, ctx);
+    yg_array_end();
+
+    yg_cstring("cfp");
+    yajl_gen_array_open(ctx->yajl);
+    while (cfp != limit_cfp) {
+      yajl_gen_map_open(ctx->yajl);
+      rb_iseq_t *iseq = cfp->iseq;
+      ygh_id("proc", cfp->proc);
+      ygh_id("self", cfp->self);
+      if (iseq) {
+          ygh_id("iseq", RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq);
+          int line_no = rb_vm_get_sourceline(cfp);
+          ygh_rstring("file", iseq->filename);
+          ygh_int("line_no",line_no);
+      }
+      if (cfp->me){
+        const rb_method_entry_t *me = cfp->me;
+        //((rb_method_entry_t *)cfp->me)->mark = 1;
+        yg_cstring("me");
+        yajl_gen_map_open(ctx->yajl);
+        //
+        //rb_method_flag_t flag;
+     //   char mark;
+        //rb_method_definition_t *def;
+        ygh_id("klass", me->klass);
+        ID id = me->called_id;
+
+        if(me->def){
+          id = me->def->original_id;
+          yg_cstring("def");
+          dump_method_definition_as_value(me->def, ctx);
+        }
+        if(id != ID_ALLOCATOR)
+          ygh_rstring("meth_id", rb_id2str(id));
+        yajl_gen_map_close(ctx->yajl);
+      }
+      cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+      yajl_gen_map_close(ctx->yajl);
+    }
+    yajl_gen_array_close(ctx->yajl);
+  }
+
+  //TODO: mark other...
+  ygh_id("first_proc", th->first_proc);
+  if (th->first_proc) ygh_id("first_proc", th->first_args);
+
+  ygh_id("thgroup", th->thgroup);
+  ygh_id("value", th->value);
+  ygh_id("errinfo", th->errinfo);
+  ygh_id("thrown_errinfo", th->thrown_errinfo);
+  ygh_id("local_svar", th->local_svar);
+  ygh_id("top_self", th->top_self);
+  ygh_id("top_wrapper", th->top_wrapper);
+  ygh_id("fiber", th->fiber);
+  ygh_id("root_fiber", th->root_fiber);
+  ygh_id("stat_insn_usage", th->stat_insn_usage);
+  ygh_id("last_status", th->last_status);
+  ygh_id("locking_mutex", th->locking_mutex);
+
+  if (GET_THREAD() != th && th->machine_stack_start && th->machine_stack_end) {
+      // rb_gc_mark_machine_stack(th);
+      VALUE *stack_start, *stack_end;
+      GET_STACK_BOUNDS(stack_start, stack_end, 0);
+      // /sizeof(VALUE)?
+      yg_cstring("mach_stack");
+      yg_array();
+      dump_locations(stack_start, (stack_end-stack_start), ctx);
+      yg_array_end();
+
+      yg_cstring("mach_regs");
+      yg_array();
+      dump_locations((VALUE *)&th->machine_regs, sizeof(th->machine_regs) / sizeof(VALUE), ctx);
+      yg_array_end();
+  }
+
+  yg_cstring("local_storage");
+  yajl_gen_array_open(ctx->yajl);
+  if(th->local_storage){
+    st_foreach(th->local_storage, dump_iv_entry, ctx); //?
+  }
+  yajl_gen_array_close(ctx->yajl);
+
+    // mark_event_hooks(th->event_hooks);
+  rb_event_hook_t *hook = th->event_hooks;
+  yg_cstring("event_hooks");
+  yajl_gen_array_open(ctx->yajl);
+  while(hook){
+    yg_id(hook->data);
+    hook = hook->next;
+  }
+  yajl_gen_array_close(ctx->yajl);
+}
+
 
 static void dump_machine_context(walk_ctx_t *ctx){
   //TODO: other threads?

data/lib/heap_dump/version.rb

@@ -1,3 +1,3 @@
 module HeapDump
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heap_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-internal
-  requirement: &70141674362520 !ruby/object:Gem::Requirement
+  requirement: &70233944233020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70141674362520
+  version_requirements: *70233944233020
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70141674359400 !ruby/object:Gem::Requirement
+  requirement: &70233944231400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70141674359400
+  version_requirements: *70233944231400
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70141674358340 !ruby/object:Gem::Requirement
+  requirement: &70233944230620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141674358340
+  version_requirements: *70233944230620
 description: dump ruby 1.9 heap contents
 email:
 - vasilyfedoseyev@gmail.com