heap_dump 0.0.25 → 0.0.26

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle

data/README.md

@@ -1,7 +1,9 @@
 # HeapDump
 
 Low-level ruby heap memory dump - including data and code references.
-Written across ruby 1.9.2-p290 data structures. Other rubies support may come later (or may not).
+Originally written across ruby 1.9.2-p290 data structures.
+
+Does work on other 1.9.2s and 1.9.3, but not well-tested yet(output is not proven to be as full etc.).
 
 Currently is under development and output format may differ.
 

data/ext/heap_dump/extconf.rb

@@ -31,6 +31,10 @@ spec = instance_eval(File.read(gemspec), gemspec).dependencies.find{|d|d.name ==
 yajl = find_gem_dir(spec.name, spec.requirement)
 find_header('api/yajl_gen.h', File.join(yajl, 'ext', 'yajl'))
 
+#TODO: inject ruby version
+unless find_header("gc_internal.h", File.join(File.dirname(__FILE__),'specific', "ruby-#{RUBY_VERSION}")) && have_header("gc_internal.h")
+  raise "Do not have internal structs for your ruby version"
+end
 
 hdrs = proc {
   res = %w{
@@ -45,6 +49,7 @@ hdrs = proc {
   #optional:
   %w{
     constant.h
+    internal.h
     }.each{|h| have_header(h)}
 
   res

data/ext/heap_dump/heap_dump.c

@@ -4,19 +4,10 @@
 
 
 #ifdef HAVE_CONSTANT_H
-//have this in 1.9.3+, for future compatibility
+//have this in 1.9.3
 #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;
+#include "internal_constant.h"
 #endif
 
 #include "node.h"
@@ -24,10 +15,25 @@
 // #include "atomic.h"
 #include "iseq.h"
 
+#ifdef HAVE_INTERNAL_H
+#include "internal.h"
+#else
 #define RCLASS_EXT(c) (RCLASS(c)->ptr)
+#endif
 
 #define NODE_OP_ASGN2_ARG NODE_LAST + 1
 
+#ifndef FALSE
+# define FALSE 0
+#elif FALSE
+# error FALSE must be false
+#endif
+#ifndef TRUE
+# define TRUE 1
+#elif !TRUE
+# error TRUE must be true
+#endif
+
 #include "method.h"
 
 #include "ruby_io.h" // need rb_io_t
@@ -40,6 +46,18 @@
 
 // simple test - rake compile && bundle exec ruby -e 'require "heap_dump"; HeapDump.dump'
 
+
+#ifdef HAVE_GC_INTERNAL_H
+#include "gc_internal.h"
+#else
+  #error No internal gc header for your ruby
+  //TODO: just do not dump something?
+#endif
+
+#include "fiber.h"
+#include "internal_typed_data.h"
+
+
 static VALUE rb_mHeapDumpModule;
 
 static ID classid;
@@ -86,7 +104,7 @@ static void flush_yajl(walk_ctx_t *ctx){
   }
 }
 
-static inline int is_pointer_to_heap(void *ptr, void* osp);
+static inline int is_in_heap(void *ptr, void* osp);
 
 static inline const char* rb_builtin_type(VALUE obj){
   switch(BUILTIN_TYPE(obj)){
@@ -351,7 +369,7 @@ static void dump_node_refs(NODE* obj, walk_ctx_t* ctx){
         unsigned long n = obj->u3.cnt;
         while (n--) {
           //v = *x;
-         // if (is_pointer_to_heap(objspace, (void *)v)) {
+         // if (is_in_heap((void *)v), objspace) {
              // //gc_mark(objspace, v, 0);
             yg_id(*x);
          // }
@@ -383,12 +401,12 @@ static void dump_node_refs(NODE* obj, walk_ctx_t* ctx){
     //iteration func - blocks,procs,lambdas etc:
     case NODE_IFUNC: //NEN_CFNC, NEN_TVAL, NEN_STATE? / u2 seems to be data for func(context?)
       //printf("IFUNC NODE: %p %p %p\n", obj->nd_cfnc, obj->u2.node, (void*)obj->nd_aid /*u3 - aid id- - aka frame_this_func?*/);
-      if(is_pointer_to_heap(obj->u2.node, 0)){
+      if(is_in_heap(obj->u2.node, 0)){
         //printf("in heap: %p\n", obj->u2.node);
         //TODO: do we need to dump it inline?
         yg_id((VALUE)obj->u2.node);
       }
-      if(is_pointer_to_heap( (void*)obj->nd_aid, 0)){
+      if(is_in_heap( (void*)obj->nd_aid, 0)){
         //printf("in heap: %p\n", (void*)obj->nd_aid);
         yg_id(obj->nd_aid);
       }
@@ -403,9 +421,9 @@ static void dump_node_refs(NODE* obj, walk_ctx_t* ctx){
       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); }
-      // if (is_pointer_to_heap(objspace, obj->as.node.u2.node)) { gc_mark(objspace, (VALUE)obj->as.node.u2.node, lev); }
-      // if (is_pointer_to_heap(objspace, obj->as.node.u3.node)) { gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev); }
+      // if (is_in_heap(obj->as.node.u1.node, objspace)) { gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev); }
+      // if (is_in_heap(obj->as.node.u2.node, objspace)) { gc_mark(objspace, (VALUE)obj->as.node.u2.node, lev); }
+      // if (is_in_heap(obj->as.node.u3.node, objspace)) { gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev); }
 
       //yg_id((VALUE)obj->u1.node);
       //yg_id((VALUE)obj->u2.node);
@@ -586,58 +604,6 @@ static void dump_block(const rb_block_t* block, walk_ctx_t *ctx){
 }
 
 
-#define CAPTURE_JUST_VALID_VM_STACK 1
-
-enum context_type {
-    CONTINUATION_CONTEXT = 0,
-    FIBER_CONTEXT = 1,
-    ROOT_FIBER_CONTEXT = 2
-};
-
-typedef struct rb_context_struct {
-    enum context_type type;
-    VALUE self;
-    int argc;
-    VALUE value;
-    VALUE *vm_stack;
-#ifdef CAPTURE_JUST_VALID_VM_STACK
-    size_t vm_stack_slen;  /* length of stack (head of th->stack) */
-    size_t vm_stack_clen;  /* length of control frames (tail of th->stack) */
-#endif
-    VALUE *machine_stack;
-    VALUE *machine_stack_src;
-#ifdef __ia64
-    VALUE *machine_register_stack;
-    VALUE *machine_register_stack_src;
-    int machine_register_stack_size;
-#endif
-    rb_thread_t saved_thread;
-    rb_jmpbuf_t jmpbuf;
-    size_t machine_stack_size;
-} rb_context_t;
-
-
-
-enum fiber_status {
-    CREATED,
-    RUNNING,
-    TERMINATED
-};
-
-///TODO: move this out
-typedef struct rb_fiber_struct {
-    rb_context_t cont;
-    VALUE prev;
-    enum fiber_status status;
-    struct rb_fiber_struct *prev_fiber;
-    struct rb_fiber_struct *next_fiber;
-} rb_fiber_t;
-
-
-
-
-
-
 
 static void yg_fiber_status(enum fiber_status status, walk_ctx_t* ctx){
   switch(status){
@@ -660,7 +626,7 @@ static void dump_locations(VALUE* p, long int n, walk_ctx_t *ctx){
     VALUE* x = p;
     while(n--){
       VALUE v = *x;
-      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)
+      if(is_in_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++;
     }
@@ -683,15 +649,6 @@ 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){
 
@@ -757,9 +714,9 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     ygh_int("method_id", data->id);
 
     yg_cstring("method");
-    if(data->me.def){
+    if(METHOD_DEFINITIONP(data)){
       //printf("methof def %p\n", &data->me);
-      dump_method_definition_as_value(data->me.def, ctx);
+      dump_method_definition_as_value(METHOD_DEFINITIONP(data), ctx);
       //printf("meth end\n");
     }
     return;
@@ -794,27 +751,6 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     return;
   }
 
-    //FIXME: autogen this:
-    struct enumerator {
-        VALUE obj;
-        ID    meth;
-        VALUE args;
-        VALUE fib;
-        VALUE dst;
-        VALUE lookahead;
-        VALUE feedvalue;
-        VALUE stop_exc;
-    };
-
-    struct generator {
-      VALUE proc;
-    };
-
-    struct yielder {
-      VALUE proc;
-    };
-// end of fixme
-
   if(!strcmp("enumerator", typename)){
     struct enumerator *ptr = RTYPEDDATA_DATA(obj);
     ygh_id("obj", ptr->obj);
@@ -929,12 +865,6 @@ static void dump_data_if_known(VALUE obj, walk_ctx_t *ctx){
     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);
@@ -1150,10 +1080,11 @@ static inline void walk_live_object(VALUE obj, walk_ctx_t *ctx){
     case T_DATA: // data of extensions + raw bytecode etc., refs undumpable? maybe in some way mess with mark callback? (need to intercept rb_gc_mark :( )
       if(RTYPEDDATA_P(obj)){
         ygh_cstring("type_name", RTYPEDDATA_TYPE(obj)->wrap_struct_name);
-        if(RTYPEDDATA_TYPE(obj)->dsize){
-          ygh_int("size", RTYPEDDATA_TYPE(obj)->dsize(RTYPEDDATA_DATA(obj)));
-        }
-
+#if HAVE_RB_DATA_TYPE_T_FUNCTION
+        if(RTYPEDDATA_TYPE(obj)->function.dsize) ygh_int("size", RTYPEDDATA_TYPE(obj)->function.dsize(RTYPEDDATA_DATA(obj)));
+#else
+        if(RTYPEDDATA_TYPE(obj)->dsize) ygh_int("size", RTYPEDDATA_TYPE(obj)->dsize(RTYPEDDATA_DATA(obj)));
+#endif
         dump_data_if_known(obj, ctx);
       }
       break;
@@ -1255,276 +1186,15 @@ ruby_get_stack_grow_direction(volatile VALUE *addr)
 
 #define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
 
-extern st_table *rb_class_tbl;
-
 
 /////////////
-#define MARK_STACK_MAX 1024
-
-#ifndef CALC_EXACT_MALLOC_SIZE
-#define CALC_EXACT_MALLOC_SIZE 0
-#endif
-#include "ruby/re.h"
-
-#ifndef FALSE
-# define FALSE 0
-#elif FALSE
-# error FALSE must be false
-#endif
-#ifndef TRUE
-# define TRUE 1
-#elif !TRUE
-# error TRUE must be true
-#endif
-
-//FIXME: this should be autoextracted from ruby
-// see how this is done in ruby-internal gem
-typedef struct RVALUE {
-    union {
-  struct {
-      VALUE flags;    /* always 0 for freed obj */
-      struct RVALUE *next;
-  } free;
-  struct RBasic  basic;
-  struct RObject object;
-  struct RClass  klass;
-  struct RFloat  flonum;
-  struct RString string;
-  struct RArray  array;
-  struct RRegexp regexp;
-  struct RHash   hash;
-  struct RData   data;
-  struct RTypedData   typeddata;
-  struct RStruct rstruct;
-  struct RBignum bignum;
-  struct RFile   file;
-  struct RNode   node;
-  struct RMatch  match;
-  struct RRational rational;
-  struct RComplex complex;
-    } as;
-#ifdef GC_DEBUG
-    const char *file;
-    int   line;
-#endif
-} RVALUE;
-
-typedef struct gc_profile_record {
-    double gc_time;
-    double gc_mark_time;
-    double gc_sweep_time;
-    double gc_invoke_time;
-
-    size_t heap_use_slots;
-    size_t heap_live_objects;
-    size_t heap_free_objects;
-    size_t heap_total_objects;
-    size_t heap_use_size;
-    size_t heap_total_size;
-
-    int have_finalize;
-    int is_marked;
-
-    size_t allocate_increase;
-    size_t allocate_limit;
-} gc_profile_record;
-
-struct heaps_slot {
-    void *membase;
-    RVALUE *slot;
-    size_t limit;
-    uintptr_t *bits;
-    RVALUE *freelist;
-    struct heaps_slot *next;
-    struct heaps_slot *prev;
-    struct heaps_slot *free_next;
-};
-
-struct heaps_header {
-    struct heaps_slot *base;
-    uintptr_t *bits;
-};
-
-struct sorted_heaps_slot {
-    RVALUE *start;
-    RVALUE *end;
-    struct heaps_slot *slot;
-};
-
-struct heaps_free_bitmap {
-    struct heaps_free_bitmap *next;
-};
-
-struct gc_list {
-    VALUE *varptr;
-    struct gc_list *next;
-};
-
-
-// typedef struct rb_objspace {
-//   struct {
-//     size_t limit;
-//     size_t increase;
-// //FIXME: this should match ruby settings
-// //#if CALC_EXACT_MALLOC_SIZE
-//     size_t allocated_size;
-//     size_t allocations;
-// //#endif
-//   } malloc_params;
-
-//   struct {
-//       size_t increment;
-//       struct heaps_slot *ptr;
-//       struct heaps_slot *sweep_slots;
-//       struct heaps_slot *free_slots;
-//       struct sorted_heaps_slot *sorted;
-//       size_t length;
-//       size_t used;
-//       struct heaps_free_bitmap *free_bitmap;
-//       RVALUE *range[2];
-//       RVALUE *freed;
-//       size_t live_num;
-//       size_t free_num;
-//       size_t free_min;
-//       size_t final_num;
-//       size_t do_heap_free;
-//   } heap;
-
-//   struct {
-//     int dont_gc;
-//     int dont_lazy_sweep;
-//     int during_gc;
-//     rb_atomic_t finalizing;
-//   } flags;
-
-//   struct {
-//     st_table *table;
-//     RVALUE *deferred;
-//   } final;
-
-//   struct {
-//     VALUE buffer[MARK_STACK_MAX];
-//     VALUE *ptr;
-//     int overflow;
-//   } markstack;
-
-//   struct {
-//     int run;
-//     gc_profile_record *record;
-//     size_t count;
-//     size_t size;
-//     double invoke_time;
-//   } profile;
-
-//   struct gc_list *global_list;
-//   size_t count;
-//   int gc_stress;
-// } rb_objspace_t;
-
-
-// 1.9.2-p290:
-typedef struct rb_objspace {
-    struct {
-  size_t limit;
-  size_t increase;
-#if CALC_EXACT_MALLOC_SIZE
-  size_t allocated_size;
-  size_t allocations;
-#endif
-    } malloc_params;
-    struct {
-  size_t increment;
-  struct heaps_slot *ptr;
-  size_t length;
-  size_t used;
-  RVALUE *freelist;
-  RVALUE *range[2];
-  RVALUE *freed;
-    } heap;
-    struct {
-  int dont_gc;
-  int during_gc;
-    } flags;
-    struct {
-  st_table *table;
-  RVALUE *deferred;
-    } final;
-    struct {
-  VALUE buffer[MARK_STACK_MAX];
-  VALUE *ptr;
-  int overflow;
-    } markstack;
-    struct {
-  int run;
-  gc_profile_record *record;
-  size_t count;
-  size_t size;
-  double invoke_time;
-    } profile;
-    struct gc_list *global_list;
-    unsigned int count;
-    int gc_stress;
-} rb_objspace_t;
-
-#define malloc_limit    objspace->malloc_params.limit
-#define malloc_increase   objspace->malloc_params.increase
-#define heaps     objspace->heap.ptr
-#define heaps_length    objspace->heap.length
-#define heaps_used    objspace->heap.used
-#define lomem     objspace->heap.range[0]
-#define himem     objspace->heap.range[1]
-#define heaps_inc   objspace->heap.increment
-#define heaps_freed   objspace->heap.freed
-#define dont_gc     objspace->flags.dont_gc
-#define during_gc   objspace->flags.during_gc
-#define finalizing    objspace->flags.finalizing
-#define finalizer_table   objspace->final.table
-#define deferred_final_list objspace->final.deferred
-#define mark_stack    objspace->markstack.buffer
-#define mark_stack_ptr    objspace->markstack.ptr
-#define mark_stack_overflow objspace->markstack.overflow
-#define global_List   objspace->global_list
-
-#define RANY(o) ((RVALUE*)(o))
-
-static inline int
-is_pointer_to_heap(void *ptr, void* osp)
-{
-    rb_objspace_t *objspace = osp;
-    if(!ptr) return false;
-    if(!objspace) objspace = GET_THREAD()->vm->objspace;
 
-    register RVALUE *p = RANY(ptr);
-    //register struct sorted_heaps_slot *heap;
-    register size_t hi, lo, mid;
 
-    if (p < lomem || p > himem) {
-      //printf("not in range %p - %p (objspace %p, l%u used %u)\n", lo, hi, objspace, heaps_length, heaps_used);
-      return FALSE;
-    }
-    //printf("ptr in range\n");
-    if ((VALUE)p % sizeof(RVALUE) != 0) return FALSE;
-    //printf("ptr %p align correct\n", ptr);
-
-  //1.9.2-p290
-  /* check if p looks like a pointer using bsearch*/
-      lo = 0;
-      hi = heaps_used;
-      while (lo < hi) {
-    mid = (lo + hi) / 2;
-    register struct heaps_slot *heap;
-    heap = &heaps[mid];
-    if (heap->slot <= p) {
-        if (p < heap->slot + heap->limit)
-      return TRUE;
-        lo = mid + 1;
-    }
-    else {
-        hi = mid;
-    }
-      }
-    //printf("not found");
-    return FALSE;
+static inline int is_in_heap(void *ptr, void* osp){
+  rb_objspace_t *objspace = osp;
+  if(!ptr) return false;
+  if(!objspace) objspace = GET_THREAD()->vm->objspace;
+  return is_pointer_to_heap(objspace, ptr);
 }
 
 
@@ -1581,7 +1251,7 @@ vm_backtrace_each(const rb_thread_t *th, int lev, void (*init)(void *), rb_backt
   }
   else if (RUBYVM_CFUNC_FRAME_P(cfp)) {
       ID id;
-      extern VALUE ruby_engine_name;
+      
 
       if (NIL_P(file)) file = ruby_engine_name;
       if (cfp->me->def)
@@ -1735,7 +1405,7 @@ static void dump_machine_context(walk_ctx_t *ctx){
   //printf("registers\n");
   while (n--) {
     VALUE v = *(x++);
-    if(is_pointer_to_heap((void*)v, NULL))
+    if(is_in_heap((void*)v, NULL))
       yg_id(v);
   }
   yajl_gen_array_close(ctx->yajl);
@@ -1751,7 +1421,7 @@ static void dump_machine_context(walk_ctx_t *ctx){
       VALUE v = *(x++);
       //printf("val: %p\n", (void*)v);
       //FIXME: other objspace (not default one?)
-      if(is_pointer_to_heap((void*)v, NULL)) {
+      if(is_in_heap((void*)v, NULL)) {
         //printf("ON heap\n");
         yg_id(v);
       }
@@ -1773,7 +1443,7 @@ static int dump_iv_entry1(ID key, rb_const_entry_t* ce/*st_data_t val*/, walk_ct
 
   //printf("name %s\n", RSTRING_PTR(rb_class_path(rb_class_real_checked(value))));
 
-  //if(is_pointer_to_heap(value, NULL)){
+  //if(is_in_heap(value, NULL)){
     //printf("on heap\n");
     yg_id(value);
   //}
@@ -1827,6 +1497,7 @@ void heapdump_dump(const char* filename){
     //printf("global %p\n", v);
   }
 
+#ifdef HAVE_RB_CLASS_TBL
   yg_cstring("classes");
   yajl_gen_array_open(ctx->yajl);
   printf("classes\n");
@@ -1835,6 +1506,7 @@ void heapdump_dump(const char* filename){
   else printf("no classes\n");
   yajl_gen_array_close(ctx->yajl);
   flush_yajl(ctx);
+#endif
 
   //try_dump_generic_ivars();
 

data/ext/heap_dump/specific/ruby-1.9.2/fiber.h

@@ -0,0 +1,48 @@
+//1.9.2
+
+#define CAPTURE_JUST_VALID_VM_STACK 1
+
+enum context_type {
+    CONTINUATION_CONTEXT = 0,
+    FIBER_CONTEXT = 1,
+    ROOT_FIBER_CONTEXT = 2
+};
+
+typedef struct rb_context_struct {
+    enum context_type type;
+    VALUE self;
+    int argc;
+    VALUE value;
+    VALUE *vm_stack;
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+    size_t vm_stack_slen;  /* length of stack (head of th->stack) */
+    size_t vm_stack_clen;  /* length of control frames (tail of th->stack) */
+#endif
+    VALUE *machine_stack;
+    VALUE *machine_stack_src;
+#ifdef __ia64
+    VALUE *machine_register_stack;
+    VALUE *machine_register_stack_src;
+    int machine_register_stack_size;
+#endif
+    rb_thread_t saved_thread;
+    rb_jmpbuf_t jmpbuf;
+    size_t machine_stack_size;
+} rb_context_t;
+
+
+
+enum fiber_status {
+    CREATED,
+    RUNNING,
+    TERMINATED
+};
+
+typedef struct rb_fiber_struct {
+    rb_context_t cont;
+    VALUE prev;
+    enum fiber_status status;
+    struct rb_fiber_struct *prev_fiber;
+    struct rb_fiber_struct *next_fiber;
+} rb_fiber_t;
+

data/ext/heap_dump/specific/ruby-1.9.2/gc_internal.h

@@ -0,0 +1,192 @@
+//extracted from ruby 1.9.2 p290, should be compatible with all 1.9.2's
+
+//TODO: does conflict with ruby framework?
+#include "ruby/re.h"
+
+//FIXME: this should be autoextracted from ruby
+// see how this is done in ruby-internal gem
+
+
+#define MARK_STACK_MAX 1024
+
+#ifndef CALC_EXACT_MALLOC_SIZE
+#define CALC_EXACT_MALLOC_SIZE 0
+#endif
+
+typedef struct RVALUE {
+    union {
+  struct {
+      VALUE flags;    /* always 0 for freed obj */
+      struct RVALUE *next;
+  } free;
+  struct RBasic  basic;
+  struct RObject object;
+  struct RClass  klass;
+  struct RFloat  flonum;
+  struct RString string;
+  struct RArray  array;
+  struct RRegexp regexp;
+  struct RHash   hash;
+  struct RData   data;
+  struct RTypedData   typeddata;
+  struct RStruct rstruct;
+  struct RBignum bignum;
+  struct RFile   file;
+  struct RNode   node;
+  struct RMatch  match;
+  struct RRational rational;
+  struct RComplex complex;
+    } as;
+#ifdef GC_DEBUG
+    const char *file;
+    int   line;
+#endif
+} RVALUE;
+
+typedef struct gc_profile_record {
+    double gc_time;
+    double gc_mark_time;
+    double gc_sweep_time;
+    double gc_invoke_time;
+
+    size_t heap_use_slots;
+    size_t heap_live_objects;
+    size_t heap_free_objects;
+    size_t heap_total_objects;
+    size_t heap_use_size;
+    size_t heap_total_size;
+
+    int have_finalize;
+    int is_marked;
+
+    size_t allocate_increase;
+    size_t allocate_limit;
+} gc_profile_record;
+
+struct heaps_slot {
+    void *membase;
+    RVALUE *slot;
+    size_t limit;
+    uintptr_t *bits;
+    RVALUE *freelist;
+    struct heaps_slot *next;
+    struct heaps_slot *prev;
+    struct heaps_slot *free_next;
+};
+
+struct heaps_header {
+    struct heaps_slot *base;
+    uintptr_t *bits;
+};
+
+struct sorted_heaps_slot {
+    RVALUE *start;
+    RVALUE *end;
+    struct heaps_slot *slot;
+};
+
+struct heaps_free_bitmap {
+    struct heaps_free_bitmap *next;
+};
+
+struct gc_list {
+    VALUE *varptr;
+    struct gc_list *next;
+};
+
+
+// 1.9.2-p290:
+typedef struct rb_objspace {
+    struct {
+  size_t limit;
+  size_t increase;
+#if CALC_EXACT_MALLOC_SIZE
+  size_t allocated_size;
+  size_t allocations;
+#endif
+    } malloc_params;
+    struct {
+  size_t increment;
+  struct heaps_slot *ptr;
+  size_t length;
+  size_t used;
+  RVALUE *freelist;
+  RVALUE *range[2];
+  RVALUE *freed;
+    } heap;
+    struct {
+  int dont_gc;
+  int during_gc;
+    } flags;
+    struct {
+  st_table *table;
+  RVALUE *deferred;
+    } final;
+    struct {
+  VALUE buffer[MARK_STACK_MAX];
+  VALUE *ptr;
+  int overflow;
+    } markstack;
+    struct {
+  int run;
+  gc_profile_record *record;
+  size_t count;
+  size_t size;
+  double invoke_time;
+    } profile;
+    struct gc_list *global_list;
+    unsigned int count;
+    int gc_stress;
+} rb_objspace_t;
+
+//
+#define RANY(o) ((RVALUE*)(o))
+
+#define malloc_limit    objspace->malloc_params.limit
+#define malloc_increase   objspace->malloc_params.increase
+#define heaps     objspace->heap.ptr
+#define heaps_length    objspace->heap.length
+#define heaps_used    objspace->heap.used
+#define lomem     objspace->heap.range[0]
+#define himem     objspace->heap.range[1]
+#define heaps_inc   objspace->heap.increment
+#define heaps_freed   objspace->heap.freed
+#define dont_gc     objspace->flags.dont_gc
+#define during_gc   objspace->flags.during_gc
+#define finalizing    objspace->flags.finalizing
+#define finalizer_table   objspace->final.table
+#define deferred_final_list objspace->final.deferred
+#define mark_stack    objspace->markstack.buffer
+#define mark_stack_ptr    objspace->markstack.ptr
+#define mark_stack_overflow objspace->markstack.overflow
+#define global_List   objspace->global_list
+
+
+//1.9.2-p290
+static inline int
+is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
+{
+    register RVALUE *p = RANY(ptr);
+    register struct heaps_slot *heap;
+    register size_t hi, lo, mid;
+
+    if (p < lomem || p > himem) return FALSE;
+    if ((VALUE)p % sizeof(RVALUE) != 0) return FALSE;
+
+  /* check if p looks like a pointer using bsearch*/
+      lo = 0;
+      hi = heaps_used;
+      while (lo < hi) {
+    mid = (lo + hi) / 2;
+    heap = &heaps[mid];
+    if (heap->slot <= p) {
+        if (p < heap->slot + heap->limit)
+      return TRUE;
+        lo = mid + 1;
+    }
+    else {
+        hi = mid;
+    }
+      }
+    return FALSE;
+}

data/ext/heap_dump/specific/ruby-1.9.2/internal_constant.h

@@ -0,0 +1,10 @@
+//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;

data/ext/heap_dump/specific/ruby-1.9.2/internal_typed_data.h

@@ -0,0 +1,45 @@
+  //FIXME: autogen this from ruby (this copied from 1.9.2p290)
+struct thgroup {
+  int enclosed;
+  VALUE group;
+};
+
+
+  //
+
+struct enumerator {
+    VALUE obj;
+    ID    meth;
+    VALUE args;
+    VALUE fib;
+    VALUE dst;
+    VALUE lookahead;
+    VALUE feedvalue;
+    VALUE stop_exc;
+};
+
+struct generator {
+  VALUE proc;
+};
+
+struct yielder {
+  VALUE proc;
+};
+
+//
+struct METHOD {
+    VALUE recv;
+    VALUE rclass;
+    ID id;
+    rb_method_entry_t me;
+};
+
+//
+
+#define METHOD_DEFINITIONP(m) m->me.def
+
+#define HAVE_RB_CLASS_TBL 1
+//class.c:
+extern st_table *rb_class_tbl;
+
+extern VALUE ruby_engine_name;

data/ext/heap_dump/specific/ruby-1.9.3/fiber.h

@@ -0,0 +1,53 @@
+//1.9.3
+//from cont.c:
+
+#define CAPTURE_JUST_VALID_VM_STACK 1
+
+enum context_type {
+    CONTINUATION_CONTEXT = 0,
+    FIBER_CONTEXT = 1,
+    ROOT_FIBER_CONTEXT = 2
+};
+
+typedef struct rb_context_struct {
+    enum context_type type;
+    VALUE self;
+    int argc;
+    VALUE value;
+    VALUE *vm_stack;
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+    size_t vm_stack_slen;  /* length of stack (head of th->stack) */
+    size_t vm_stack_clen;  /* length of control frames (tail of th->stack) */
+#endif
+    VALUE *machine_stack;
+    VALUE *machine_stack_src;
+#ifdef __ia64
+    VALUE *machine_register_stack;
+    VALUE *machine_register_stack_src;
+    int machine_register_stack_size;
+#endif
+    rb_thread_t saved_thread;
+    rb_jmpbuf_t jmpbuf;
+    size_t machine_stack_size;
+} rb_context_t;
+
+enum fiber_status {
+    CREATED,
+    RUNNING,
+    TERMINATED
+};
+
+typedef struct rb_fiber_struct {
+    rb_context_t cont;
+    VALUE prev;
+    enum fiber_status status;
+    struct rb_fiber_struct *prev_fiber;
+    struct rb_fiber_struct *next_fiber;
+#if FIBER_USE_NATIVE
+#ifdef _WIN32
+    void *fib_handle;
+#else
+    ucontext_t context;
+#endif
+#endif
+} rb_fiber_t;

data/ext/heap_dump/specific/ruby-1.9.3/gc_internal.h

@@ -0,0 +1,191 @@
+//TODO: does conflict with ruby framework?
+#include "ruby/re.h"
+
+//gc.c
+
+#define MARK_STACK_MAX 1024
+//
+/* for GC profile */
+#define GC_PROFILE_MORE_DETAIL 0
+typedef struct gc_profile_record {
+    double gc_time;
+    double gc_mark_time;
+    double gc_sweep_time;
+    double gc_invoke_time;
+
+    size_t heap_use_slots;
+    size_t heap_live_objects;
+    size_t heap_free_objects;
+    size_t heap_total_objects;
+    size_t heap_use_size;
+    size_t heap_total_size;
+
+    int have_finalize;
+    int is_marked;
+
+    size_t allocate_increase;
+    size_t allocate_limit;
+} gc_profile_record;
+//
+
+typedef struct RVALUE {
+    union {
+  struct {
+      VALUE flags;    /* always 0 for freed obj */
+      struct RVALUE *next;
+  } free;
+  struct RBasic  basic;
+  struct RObject object;
+  struct RClass  klass;
+  struct RFloat  flonum;
+  struct RString string;
+  struct RArray  array;
+  struct RRegexp regexp;
+  struct RHash   hash;
+  struct RData   data;
+  struct RTypedData   typeddata;
+  struct RStruct rstruct;
+  struct RBignum bignum;
+  struct RFile   file;
+  struct RNode   node;
+  struct RMatch  match;
+  struct RRational rational;
+  struct RComplex complex;
+    } as;
+#ifdef GC_DEBUG
+    const char *file;
+    int   line;
+#endif
+} RVALUE;
+
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(pop)
+#endif
+
+struct heaps_slot {
+    void *membase;
+    RVALUE *slot;
+    size_t limit;
+    struct heaps_slot *next;
+    struct heaps_slot *prev;
+};
+
+struct sorted_heaps_slot {
+    RVALUE *start;
+    RVALUE *end;
+    struct heaps_slot *slot;
+};
+
+struct gc_list {
+    VALUE *varptr;
+    struct gc_list *next;
+};
+
+#define CALC_EXACT_MALLOC_SIZE 0
+
+typedef struct rb_objspace {
+    struct {
+  size_t limit;
+  size_t increase;
+#if CALC_EXACT_MALLOC_SIZE
+  size_t allocated_size;
+  size_t allocations;
+#endif
+    } malloc_params;
+    struct {
+  size_t increment;
+  struct heaps_slot *ptr;
+  struct heaps_slot *sweep_slots;
+  struct sorted_heaps_slot *sorted;
+  size_t length;
+  size_t used;
+  RVALUE *freelist;
+  RVALUE *range[2];
+  RVALUE *freed;
+  size_t live_num;
+  size_t free_num;
+  size_t free_min;
+  size_t final_num;
+  size_t do_heap_free;
+    } heap;
+    struct {
+  int dont_gc;
+  int dont_lazy_sweep;
+  int during_gc;
+    } flags;
+    struct {
+  st_table *table;
+  RVALUE *deferred;
+    } final;
+    struct {
+  VALUE buffer[MARK_STACK_MAX];
+  VALUE *ptr;
+  int overflow;
+    } markstack;
+    struct {
+  int run;
+  gc_profile_record *record;
+  size_t count;
+  size_t size;
+  double invoke_time;
+    } profile;
+    struct gc_list *global_list;
+    size_t count;
+    int gc_stress;
+} rb_objspace_t;
+
+//
+
+#define malloc_limit    objspace->malloc_params.limit
+#define malloc_increase   objspace->malloc_params.increase
+#define heaps     objspace->heap.ptr
+#define heaps_length    objspace->heap.length
+#define heaps_used    objspace->heap.used
+#define freelist    objspace->heap.freelist
+#define lomem     objspace->heap.range[0]
+#define himem     objspace->heap.range[1]
+#define heaps_inc   objspace->heap.increment
+#define heaps_freed   objspace->heap.freed
+#define dont_gc     objspace->flags.dont_gc
+#define during_gc   objspace->flags.during_gc
+#define finalizer_table   objspace->final.table
+#define deferred_final_list objspace->final.deferred
+#define mark_stack    objspace->markstack.buffer
+#define mark_stack_ptr    objspace->markstack.ptr
+#define mark_stack_overflow objspace->markstack.overflow
+#define global_List   objspace->global_list
+#define ruby_gc_stress    objspace->gc_stress
+#define initial_malloc_limit  initial_params.initial_malloc_limit
+#define initial_heap_min_slots  initial_params.initial_heap_min_slots
+#define initial_free_min  initial_params.initial_free_min
+
+//
+#define RANY(o) ((RVALUE*)(o))
+//
+static inline int
+is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
+{
+    register RVALUE *p = RANY(ptr);
+    register struct sorted_heaps_slot *heap;
+    register size_t hi, lo, mid;
+
+    if (p < lomem || p > himem) return FALSE;
+    if ((VALUE)p % sizeof(RVALUE) != 0) return FALSE;
+
+    /* check if p looks like a pointer using bsearch*/
+    lo = 0;
+    hi = heaps_used;
+    while (lo < hi) {
+  mid = (lo + hi) / 2;
+  heap = &objspace->heap.sorted[mid];
+  if (heap->start <= p) {
+      if (p < heap->end)
+    return TRUE;
+      lo = mid + 1;
+  }
+  else {
+      hi = mid;
+  }
+    }
+    return FALSE;
+}

data/ext/heap_dump/specific/ruby-1.9.3/internal_typed_data.h

@@ -0,0 +1,51 @@
+ //FIXME: autogen this from ruby (this copied from 1.9.3p194)
+
+// thread.c:
+struct thgroup {
+  int enclosed;
+  VALUE group;
+};
+
+// enumerator.c:
+struct enumerator {
+    VALUE obj;
+    ID    meth;
+    VALUE args;
+    VALUE fib;
+    VALUE dst;
+    VALUE lookahead;
+    VALUE feedvalue;
+    VALUE stop_exc;
+};
+
+//
+struct generator {
+    VALUE proc;
+};
+
+struct yielder {
+    VALUE proc;
+};
+
+
+// proc.c:
+struct METHOD {
+    VALUE recv;
+    VALUE rclass;
+    ID id;
+    rb_method_entry_t *me;
+    struct unlinked_method_entry_list_entry *ume;
+};
+
+//
+#define METHOD_DEFINITIONP(m) (m->me ? m->me->def : NULL)
+
+//class.c:
+// #define HAVE_RB_CLASS_TBL 1
+//For som reason this fails to link on 1.9.3 :(
+// extern st_table *rb_class_tbl;
+
+#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+
+//FIXME: get global const for it:  rb_define_global_const("RUBY_ENGINE", ruby_engine_name = MKSTR(engine));
+#define ruby_engine_name Qnil

data/heap_dump.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = HeapDump::VERSION
 
-  gem.required_ruby_version = '~>1.9.2p290' # heap structure changed in 1.9.3, support later
+  gem.required_ruby_version = '~>1.9.2'
   #gem.platform = Gem::Platform::CURRENT # other than osx - maybe later
 
   gem.extensions = "ext/heap_dump/extconf.rb"

data/lib/heap_dump/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heap_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger-ruby_core_source
@@ -75,6 +75,13 @@ files:
 - ext/heap_dump/extconf.rb
 - ext/heap_dump/heap_dump.c
 - ext/heap_dump/ruby_io.h
+- ext/heap_dump/specific/ruby-1.9.2/fiber.h
+- ext/heap_dump/specific/ruby-1.9.2/gc_internal.h
+- ext/heap_dump/specific/ruby-1.9.2/internal_constant.h
+- ext/heap_dump/specific/ruby-1.9.2/internal_typed_data.h
+- ext/heap_dump/specific/ruby-1.9.3/fiber.h
+- ext/heap_dump/specific/ruby-1.9.3/gc_internal.h
+- ext/heap_dump/specific/ruby-1.9.3/internal_typed_data.h
 - heap_dump.gemspec
 - lib/heap_dump.rb
 - lib/heap_dump/version.rb
@@ -89,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ~>
     - !ruby/object:Gem::Version
-      version: 1.9.2p290
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3428409175290370269
+      hash: -4211610270399320096
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24