heap_dump 0.0.10 → 0.0.11

data/README.md

@@ -80,6 +80,8 @@ Format is not stable yet, but looks like this:
 ,{"id":70365602717060,"bt":"T_DATA","type_name":"proc","size":72,"is_lambda":0,"blockprocval":null,"envval":70365602712440,"iseq":{"id":70365600821896,"name":"block in <class:FileList>","filename":"/Users/vasfed/.rvm/gems/ruby-1.9.2-p290/gems/rake-0.9.2.2/lib/rake/file_list.rb","line":743,"type":"block","refs_array_id":70365611724600,"coverage":null,"klass":null,"cref_stack":70365611799480,"defined_method_id":0}}
 ,{"id":70365603045160,"bt":"T_DATA","type_name":"VM/env","size":128,"refs":[]}
 ,{"id":70365613258980,"bt":"T_ICLASS","name":"Object","methods":{"==":"(CFUNC)",">":"(CFUNC)",">=":"(CFUNC)","<":"(CFUNC)","<=":"(CFUNC)","between?":"(CFUNC)"},"ivs":{"__classid__":"Comparable"},"super":70365613259120}
+,{"id":70151795145340,"bt":"T_DATA","type_name":"proc","size":72,"is_lambda":0,"blockprocval":null,"envval":70151795224840,"iseq":{"id":70151828020360,"name":"block in subscribe","filename":"/Users/vasfed/acceptor.rb","line":91,"type":"block","refs_array_id":70151796420080,"coverage":null,"klass":null,"cref_stack":70151796421080,"defined_method_id":0}}
+,{"id":70151795224840,"bt":"T_DATA","type_name":"VM/env","size":120,"refs":[70151806738200,70151796176180,"string1",null,0,70151795224840,null]}
 ]
 ```
 etc.

data/ext/heap_dump/heap_dump.c

@@ -535,6 +535,7 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
   // proc <-
   // thgroup
   // time
+  // etc...
 
   const char* typename = RTYPEDDATA_TYPE(obj)->wrap_struct_name;
 
@@ -603,6 +604,134 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     return;
   }
 
+  if(!strcmp("VM", typename)){
+    const rb_vm_t *vm = RTYPEDDATA_DATA(obj);
+
+    ygh_id("thgroup_default", vm->thgroup_default);
+    ygh_id("mark_object_ary", vm->mark_object_ary);
+    ygh_id("load_path", vm->load_path);
+    ygh_id("loaded_features", vm->loaded_features);
+    ygh_id("top_self", vm->top_self);
+    ygh_id("coverages", vm->coverages);
+
+    //TODO:
+    // if (vm->living_threads) {
+    //       st_foreach(vm->living_threads, vm_mark_each_thread_func, 0);
+    //   }
+    //   rb_gc_mark_locations(vm->special_exceptions, vm->special_exceptions + ruby_special_error_count);
+
+    //   if (vm->loading_table) {
+    //       rb_mark_tbl(vm->loading_table);
+    //   }
+
+    //   mark_event_hooks(vm->event_hooks);
+
+    //   for (i = 0; i < RUBY_NSIG; i++) {
+    //       if (vm->trap_list[i].cmd)
+    //     rb_gc_mark(vm->trap_list[i].cmd);
+    //   }
+    //     }
+    return;
+  }
+
+  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));
+      // }
+
+      // mark_event_hooks(th->event_hooks);
+
+    return;
+  }
+
+  //FIXME: autogen this from ruby (this copied from 1.9.2p290)
+  struct thgroup {
+    int enclosed;
+    VALUE group;
+  };
+
+  if(!strcmp("thgroup", typename)){
+    const struct thgroup* gr = RTYPEDDATA_DATA(obj);
+    ygh_id("group", gr->group);
+    ygh_int("enclosed", gr->enclosed);
+    return;
+  }
+
+
 }
 
 static VALUE rb_class_real_checked(VALUE cl)

data/lib/heap_dump/version.rb

@@ -1,3 +1,3 @@
 module HeapDump
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heap_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000Z
+date: 2012-06-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-internal
-  requirement: &70141930337500 !ruby/object:Gem::Requirement
+  requirement: &70360524817500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70141930337500
+  version_requirements: *70360524817500
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70141930336660 !ruby/object:Gem::Requirement
+  requirement: &70360524816940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70141930336660
+  version_requirements: *70360524816940
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70141930335600 !ruby/object:Gem::Requirement
+  requirement: &70360524816540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141930335600
+  version_requirements: *70360524816540
 description: dump ruby 1.9 heap contents
 email:
 - vasilyfedoseyev@gmail.com