heap_dump 0.0.15 → 0.0.16

data/ext/heap_dump/heap_dump.c

@@ -583,6 +583,8 @@ typedef struct rb_context_struct {
     size_t machine_stack_size;
 } rb_context_t;
 
+
+
 enum fiber_status {
     CREATED,
     RUNNING,
@@ -605,11 +607,111 @@ 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;
+    case RUNNING: yg_cstring("RUNNING"); break;
+    case TERMINATED: yg_cstring("TERMINATED"); break;
+  }
+}
 
 
 
+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); //?
+  }
+  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);
+}
 
 
 
@@ -751,9 +853,20 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     //ygh_int("cont", fib->cont);
     yg_cstring("cont");
     yg_map();
-      ygh_int("type", fib->cont.type);
+      //ygh_int("type", fib->cont.type);
+      yg_cstring("type");
+      yg_fiber_status(fib->cont.type, ctx);
+
       ygh_id("self", fib->cont.self);
       ygh_id("value", fib->cont.value);
+
+      yg_cstring("saved_thread");
+      yg_map();
+      //rb_thread_mark(&fib->cont.saved_thread);
+      dump_thread(&fib->cont.saved_thread, ctx);
+      yg_map_end();
+
+      //stacks:
       VALUE *vm_stack = fib->cont.vm_stack;
       int i = 0;
       for(; vm_stack && i < fib->cont.vm_stack_slen + fib->cont.vm_stack_clen; i++){
@@ -773,99 +886,7 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
 
   if(!strcmp("VM/thread", typename)){
     const rb_thread_t *th = RTYPEDDATA_DATA(obj);
-    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); //?
-    }
-    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);
+    dump_thread(th, ctx);
     return;
   }
 

data/lib/heap_dump/version.rb

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

metadata

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