heap_dump 0.0.24 → 0.0.25

data/.gitignore

@@ -18,4 +18,7 @@ tmp
 *.bundle
 *.so
 *.dll
-dump.json
+dump.json
+Makefile
+*.o
+mkmf.log

data/ext/heap_dump/extconf.rb

@@ -1,4 +1,8 @@
+#!/usr/bin/env ruby
+#encoding: utf-8
+
 require 'mkmf'
+require 'debugger/ruby_core_source'
 
 def find_spec name,*requirements
   return Gem::Specification.find_by_name(name, *requirements) if Gem::Specification.respond_to? :find_by_name
@@ -19,12 +23,35 @@ def find_gem_dir(name, *req)
   gem.full_gem_path
 end
 
-dir = find_gem_dir('ruby-internal', '~>0.8.5') #FIXME: DRY (see gemfile)
-find_header('version.h', File.join(dir, 'ext', 'internal', 'yarv-headers'))
-find_header('yarv-headers/node.h', File.join(dir, 'ext', 'internal'))
-find_header('internal/method/internal_method.h', File.join(dir, 'ext'))
 
-yajl = find_gem_dir('yajl-ruby', '~>1.1')
+gemspec = File.expand_path(File.join(File.dirname(__FILE__), '../../heap_dump.gemspec'))
+spec = instance_eval(File.read(gemspec), gemspec).dependencies.find{|d|d.name == 'yajl-ruby'}
+#$defs.push(format("-DREQUIRED_YAJL_VERSION=\\"%s\\"", spec.requirement)) #does not work in this form :(
+
+yajl = find_gem_dir(spec.name, spec.requirement)
 find_header('api/yajl_gen.h', File.join(yajl, 'ext', 'yajl'))
 
-create_makefile('heap_dump')
+
+hdrs = proc {
+  res = %w{
+    vm_core.h
+    iseq.h
+    node.h
+    method.h
+  }.all?{|hdr| have_header(hdr)}
+  # atomic.h
+  # constant.h
+
+  #optional:
+  %w{
+    constant.h
+    }.each{|h| have_header(h)}
+
+  res
+}
+
+dir_config("ruby") # allow user to pass in non-standard core include directory
+
+if !Debugger::RubyCoreSource::create_makefile_with_core(hdrs, "heap_dump")
+  exit(1)
+end

data/ext/heap_dump/heap_dump.c

@@ -3,25 +3,35 @@
 #include <stdio.h>
 
 
-#include "yarv-headers/constant.h"
-#include "yarv-headers/node.h"
-#include "yarv-headers/vm_core.h"
-#include "yarv-headers/atomic.h"
-#include "yarv-headers/iseq.h"
-
-//#undef RCLASS_IV_TBL
-//#include "yarv-headers/internal.h"
+#ifdef HAVE_CONSTANT_H
+//have this in 1.9.3+, for future compatibility
+#include "constant.h"
+#else
+  //from 1.9.2
+  typedef enum {
+      CONST_PUBLIC    = 0x00,
+      CONST_PRIVATE   = 0x01
+  } rb_const_flag_t;
+
+  typedef struct rb_const_entry_struct {
+      rb_const_flag_t flag;
+      VALUE value;            /* should be mark */
+  } rb_const_entry_t;
+#endif
+
+#include "node.h"
+#include "vm_core.h"
+// #include "atomic.h"
+#include "iseq.h"
+
 #define RCLASS_EXT(c) (RCLASS(c)->ptr)
 
+#define NODE_OP_ASGN2_ARG NODE_LAST + 1
 
-#include "yarv-headers/method.h"
-#include "method/internal_method.h"
+#include "method.h"
 
 #include "ruby_io.h" // need rb_io_t
 
-#include "node/ruby_internal_node.h"
-#include "node/node_type_descrip.c"
-
 #include "api/yajl_gen.h"
 
 #ifndef RUBY_VM
@@ -163,6 +173,26 @@ static void yg_id1(VALUE obj, walk_ctx_t* ctx){
   yg_int(NUM2LONG(rb_obj_id(obj)));
 }
 
+const char* node_type_name(const NODE* obj){
+#define N(n) case NODE_##n: return #n;
+  switch(nd_type(obj)){
+    N(ALIAS)
+#ifdef HAVE_NODE_ALLOCA
+    N(ALLOCA)
+#endif
+    N(AND) N(ARGS) N(ARGSCAT) N(ARGSPUSH) N(ARRAY) N(ATTRASGN) N(BACK_REF) N(BEGIN) N(BLOCK) N(BLOCK_ARG) N(BLOCK_PASS) N(BMETHOD) N(BREAK)
+    N(CALL) N(CASE) N(CDECL) N(CLASS) N(COLON2) N(COLON3) N(CONST) N(CVAR) N(CVASGN) N(CVDECL) N(DASGN) N(DASGN_CURR) N(DEFINED) N(DEFN)
+    N(DEFS) N(DOT2) N(DOT3) N(DREGX) N(DREGX_ONCE) N(DSTR) N(DSYM) N(DVAR) N(DXSTR) N(ENSURE) N(EVSTR) N(FALSE) N(FCALL) N(FLIP2) N(FLIP3)
+    N(FOR) N(GASGN) N(GVAR) N(HASH) N(IASGN) N(IF) N(IFUNC) N(ITER) N(IVAR) N(LASGN) N(LIT) N(LVAR) N(MASGN) N(MATCH) N(MATCH2) N(MATCH3)
+    N(MEMO) N(MODULE) N(NEXT) N(NIL) N(NTH_REF) N(OPT_N) N(OP_ASGN1) N(OP_ASGN2) N(OP_ASGN2_ARG) N(OP_ASGN_AND) N(OP_ASGN_OR) N(OR) N(POSTEXE)
+    N(REDO) N(RESBODY) N(RESCUE) N(RETRY) N(RETURN) N(SCLASS) N(SCOPE) N(SELF) N(SPLAT) N(STR) N(SUPER) N(TO_ARY) N(TRUE) N(UNDEF) N(UNTIL)
+    N(VALIAS) N(VCALL) N(WHEN) N(WHILE) N(XSTR) N(YIELD) N(ZARRAY) N(ZSUPER) N(LAST)
+    default:
+      return "unknown";
+  };
+#undef N
+}
+
 
 static void dump_node_refs(NODE* obj, walk_ctx_t* ctx){
   switch (nd_type(obj)) {
@@ -369,9 +399,8 @@ static void dump_node_refs(NODE* obj, walk_ctx_t* ctx){
     default:    /* unlisted NODE */
       //FIXME: check pointers!
 
-      {const Node_Type_Descrip* descrip = node_type_descrips[nd_type(obj)];
-
-      printf("UNKNOWN NODE TYPE %d(%s): %p %p %p\n", nd_type(obj), descrip ? descrip->name : "unknown", (void*)obj->u1.node, (void*)obj->u2.node, (void*)obj->u3.node);
+      {
+      printf("UNKNOWN NODE TYPE %d(%s): %p %p %p\n", nd_type(obj), node_type_name(obj), (void*)obj->u1.node, (void*)obj->u2.node, (void*)obj->u3.node);
       }
 
       // if (is_pointer_to_heap(objspace, obj->as.node.u1.node)) { gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev); }
@@ -385,10 +414,8 @@ static void dump_node_refs(NODE* obj, walk_ctx_t* ctx){
 }
 
 static inline void dump_node(NODE* obj, walk_ctx_t *ctx){
-  const Node_Type_Descrip* descrip = node_type_descrips[nd_type(obj)]; // node_type_descrip(nd_type(obj)) raises exception on unknown 65, 66 and 92
-
   ygh_int("nd_type", nd_type(obj));
-  ygh_cstring("nd_type_str", descrip ? descrip->name : "unknown");
+  ygh_cstring("nd_type_str", node_type_name(obj));
 
   yg_cstring("refs");
   yajl_gen_array_open(ctx->yajl);
@@ -542,17 +569,18 @@ static void dump_block(const rb_block_t* block, walk_ctx_t *ctx){
       yg_cstring("iseq");
       yajl_gen_map_open(ctx->yajl);
       //FIXME: id may be different (due to RBasic fields)!!!
-      ygh_id("id", block->iseq);
+      ygh_id("id", (VALUE)block->iseq);
       dump_iseq(block->iseq, ctx);
       yajl_gen_map_close(ctx->yajl);
     } else {
-      ygh_id("iseq", block->iseq);
+      ygh_id("iseq", (VALUE)block->iseq);
     }
 
   ygh_id("self", block->self);
 
-  ygh_id("lfp", block->lfp);
-  ygh_id("dfp", block->dfp);
+  //FIXME: these are pointers to some memory, may be dumped more clever
+  ygh_id("lfp", (VALUE)block->lfp);
+  ygh_id("dfp", (VALUE)block->dfp);
   //lfp = local frame pointer? local_num elems?
   // dfp = ?
 }
@@ -627,19 +655,19 @@ static void yg_fiber_type(enum context_type status, walk_ctx_t* ctx){
   }
 }
 
-static void dump_locations(VALUE* p, int n, walk_ctx_t *ctx){
+static void dump_locations(VALUE* p, long 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)
+      if(is_pointer_to_heap((void*)v, NULL)) //TODO: sometimes thread is known, may get its th->vm->objspace (in case there's a few)
         yg_id(v);
       x++;
     }
   }
 }
 
-static void dump_thread(rb_thread_t* th, walk_ctx_t *ctx);
+static void dump_thread(const rb_thread_t* th, walk_ctx_t *ctx);
 
 
 vm_dump_each_thread_func(st_data_t key, VALUE obj, walk_ctx_t *ctx){
@@ -655,6 +683,15 @@ vm_dump_each_thread_func(st_data_t key, VALUE obj, walk_ctx_t *ctx){
   return ST_CONTINUE;
 }
 
+//FIXME: parse this from ruby source!
+struct METHOD {
+  //for 1.9.2 only
+    VALUE recv;
+    VALUE rclass;
+    ID id;
+    rb_method_entry_t me;
+};
+
 
 static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
 
@@ -686,7 +723,7 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     const st_table *tbl = RTYPEDDATA_DATA(obj);
     yg_cstring("val");
     yajl_gen_map_open(ctx->yajl);
-    st_foreach(tbl, dump_method_entry_i, (st_data_t)ctx);
+    st_foreach((st_table *)tbl, dump_method_entry_i, (st_data_t)ctx); //removing const, but this should not affect hash
     yajl_gen_map_close(ctx->yajl);
     return;
   }
@@ -817,7 +854,7 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     if (vm->living_threads) {
       yg_cstring("threads");
       yg_array();
-      st_foreach(vm->living_threads, vm_dump_each_thread_func, ctx);
+      st_foreach(vm->living_threads, vm_dump_each_thread_func, (st_data_t)ctx);
       yg_array_end();
       }
     //   rb_gc_mark_locations(vm->special_exceptions, vm->special_exceptions + ruby_special_error_count);
@@ -1493,8 +1530,9 @@ is_pointer_to_heap(void *ptr, void* osp)
 
 
 static int
-dump_backtrace(walk_ctx_t *ctx, VALUE file, int line, VALUE method)
+dump_backtrace(void* data, VALUE file, int line, VALUE method)
 {
+    walk_ctx_t *ctx = data;
     yg_map();
     const char *filename = NIL_P(file) ? "<ruby>" : RSTRING_PTR(file);
 
@@ -1515,7 +1553,7 @@ dump_backtrace(walk_ctx_t *ctx, VALUE file, int line, VALUE method)
 //TODO: autogen, this func is just copied from vm.c
 //typedef int rb_backtrace_iter_func(void *, VALUE, int, VALUE);
 static int
-vm_backtrace_each(rb_thread_t *th, int lev, void (*init)(void *), rb_backtrace_iter_func *iter, void *arg)
+vm_backtrace_each(const rb_thread_t *th, int lev, void (*init)(void *), rb_backtrace_iter_func *iter, void *arg)
 {
     const rb_control_frame_t *limit_cfp = th->cfp;
     const rb_control_frame_t *cfp = (void *)(th->stack + th->stack_size);
@@ -1558,7 +1596,7 @@ vm_backtrace_each(rb_thread_t *th, int lev, void (*init)(void *), rb_backtrace_i
     return TRUE;
 }
 
-static void dump_thread(rb_thread_t* th, walk_ctx_t *ctx){
+static void dump_thread(const rb_thread_t* th, walk_ctx_t *ctx){
    if(th->stack){
     VALUE *p = th->stack;
     VALUE *sp = th->cfp->sp;
@@ -1655,7 +1693,7 @@ static void dump_thread(rb_thread_t* th, walk_ctx_t *ctx){
   yg_cstring("local_storage");
   yajl_gen_array_open(ctx->yajl);
   if(th->local_storage){
-    st_foreach(th->local_storage, dump_iv_entry, ctx); //?
+    st_foreach(th->local_storage, dump_iv_entry, (st_data_t)ctx); //?
   }
   yajl_gen_array_close(ctx->yajl);
 
@@ -1834,12 +1872,8 @@ void Init_heap_dump(){
 
   rb_require("rubygems");
   rb_funcall(rb_mKernel, gem, 1, rb_str_new2("yajl-ruby"));
-  rb_funcall(rb_mKernel, gem, 1, rb_str_new2("ruby-internal")); //TODO: version requirements
-  rb_require("internal/node");
   rb_require("yajl");
 
-  init_node_type_descrips();
-
   rb_mHeapDumpModule = rb_define_module("HeapDump");
   rb_define_singleton_method(rb_mHeapDumpModule, "dump_ext", rb_heapdump_dump, 1);
 }

data/heap_dump.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.extensions = "ext/heap_dump/extconf.rb"
 
-  gem.add_dependency "ruby-internal", '~>0.8.5'
+  gem.add_dependency "debugger-ruby_core_source"
   gem.add_dependency 'yajl-ruby', '~>1.1'
   gem.add_development_dependency "rake-compiler"
 end

data/lib/heap_dump/version.rb

@@ -1,3 +1,3 @@
 module HeapDump
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/lib/heap_dump.rb

@@ -1,9 +1,5 @@
 require "heap_dump/version"
 
-# need to require ruby-internal before our extension so that these extensions are loaded and linked
-require 'internal/node'
-require 'yajl'
-
 require 'rbconfig'
 require "heap_dump.#{RbConfig::CONFIG['DLEXT']}"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heap_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-internal
-  requirement: &70182669210140 !ruby/object:Gem::Requirement
+  name: debugger-ruby_core_source
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182669210140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70182669209560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70182669209560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70182669209100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182669209100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby 1.9 heap contents dumper
 email:
 - vasilyfedoseyev@gmail.com
@@ -81,12 +96,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3428409175290370269
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Allows to dump heap to track reference leaks, including leaks in proc contexts
   and fibers
 test_files: []
-has_rdoc: