objspace_helpers 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64bb3dba9f6e3592d48191859735a4a982057d4
-  data.tar.gz: af65ffc525b86d06a64c0bcd75852512408bee98
+  metadata.gz: d0175d9d52d2d5fdc414e9b5e9cda0475dcf33bd
+  data.tar.gz: 5c92f3b27147ecef0e63a55332a3c72262d78f68
 SHA512:
-  metadata.gz: 07223b0ee7fe06143270fd91f66f07da4a324e832e57875b4941bd3059eb9e40da01dbae0e127624f21dc0a012c9c6a855cd682e8ece0a7e6b69716d97052621
-  data.tar.gz: 31e9b72f8f15653f86b2853965470504b82c9165370315a8ba520b4d98df8360023f0490b4affe5ef74ccad0e39cc88c3f2758dd5f8fd73485c02044006df4cc
+  metadata.gz: 4a31190183b4d4d8b1d348720dd4a974c3fed2410184dcaeac3ffdef6263785cde179398581cb60b2b518e723470a82cf5926193270c5cdbd25363bcbd893c60
+  data.tar.gz: ec1a6ff89ac9d196d12eb791ab8abf0f70b993e7d5b552b6f51691a25b663e63999173d0930daa2b6a2f12ce622f542186670fb2b9cc6fe3ed80093945acd9bf

data/ext/objspace_helpers/extconf.rb

@@ -1,5 +1,5 @@
 require 'mkmf'
 
-$objs = ["objspace_info.o", "objspace_helpers.o"]
+$objs = ["id2ref.o", "objspace_info.o", "objspace_helpers.o"]
 
 create_makefile 'objspace_helpers/objspace_helpers'

data/ext/objspace_helpers/objspace_helpers.c

@@ -1,3 +1,4 @@
+#include <objspace_helpers.h>
 #include <objspace_info.h>
 
 void Init_objspace_helpers(void);
@@ -8,7 +9,7 @@ collect_addresses(void *vstart, void *vend, size_t stride, void *data)
   VALUE v = (VALUE)vstart;
   for (; v != (VALUE)vend; v += stride) {
     if (RBASIC(v)->flags)
-      rb_ary_push((VALUE) data, INT2FIX((void *)v));
+      rb_ary_push((VALUE) data, rb_obj_id(v));
   }
   return 0;
 }
@@ -30,21 +31,36 @@ static VALUE oh_addresses_to_info(VALUE self, VALUE ary)
   for (i = 0; i < RARRAY_LEN(ary); i += 1) {
     obj_addr = rb_ary_entry(ary, i);
     info_hash = rb_hash_new();
-    objspace_info(FIX2PTR(obj_addr), info_hash);
+    objspace_info(oh_id2ref(self, obj_addr), info_hash);
     rb_hash_aset(hash, obj_addr, info_hash);
   }
 
   return hash;
 }
 
-static VALUE oh_address_of_obj(VALUE self, VALUE obj)
+static void
+reachable_object_i(VALUE ref, void *data)
 {
-  return PTR2FIX(obj);
+  rb_ary_push((VALUE)data, rb_obj_id(ref));
 }
 
-static VALUE oh_obj_for_address(VALUE self, VALUE address)
+static VALUE oh_addresses_to_references(VALUE self, VALUE addresses)
 {
-  return FIX2PTR(address);
+  VALUE hash, obj_addr, references;
+  long i;
+
+  hash = rb_hash_new();
+
+  for (i = 0; i < RARRAY_LEN(addresses); i += 1) {
+    obj_addr = rb_ary_entry(addresses, i);
+
+    references = rb_ary_new();
+    rb_objspace_reachable_objects_from(oh_id2ref(self, obj_addr), reachable_object_i, (void*)references);
+
+    rb_hash_aset(hash, obj_addr, references);
+  }
+
+  return hash;
 }
 
 void Init_objspace_helpers(void)
@@ -55,6 +71,6 @@ void Init_objspace_helpers(void)
 
   rb_define_singleton_method(cObjspaceHelpers, "_dump_addresses", oh_dump_addresses, 0);
   rb_define_singleton_method(cObjspaceHelpers, "_addresses_to_info", oh_addresses_to_info, 1);
-  rb_define_singleton_method(cObjspaceHelpers, "_address_of_obj", oh_address_of_obj, 1);
-  rb_define_singleton_method(cObjspaceHelpers, "_obj_for_address", oh_obj_for_address, 1);
+  rb_define_singleton_method(cObjspaceHelpers, "_addresses_to_references", oh_addresses_to_references, 1);
+  rb_define_singleton_method(cObjspaceHelpers, "_id2ref", oh_id2ref, 1);
 }

data/ext/objspace_helpers/objspace_helpers.h

@@ -4,7 +4,6 @@
 #include <ruby.h>
 #include <ruby_private/gc.h>
 
-#define PTR2FIX(v) INT2FIX((void *)v)
-#define FIX2PTR(v) ((VALUE)NUM2SIZET(v))
+#include <id2ref.h>
 
 #endif

data/ext/objspace_helpers/objspace_info.c

@@ -38,11 +38,11 @@ obj_type(VALUE obj)
 static void
 reachable_object_i(VALUE ref, void *data)
 {
-  rb_ary_push((VALUE)data, PTR2FIX(ref));
+  rb_ary_push((VALUE)data, rb_obj_id(ref));
 }
 
 #define HASH_SET(k,v) rb_hash_aset(target_hash, rb_str_new2(k), v)
-#define HASH_SET_PTR(k,v) HASH_SET(k,INT2FIX((void *)v))
+#define HASH_SET_PTR(k,v) HASH_SET(k,rb_obj_id(v))
 #define HASH_SET_INT(k,v) HASH_SET(k,INT2FIX(v))
 #define HASH_SET_UINT(k,v) HASH_SET(k,UINT2NUM(v))
 #define HASH_SET_ULONG(k,v) HASH_SET(k,ULONG2NUM(v))
@@ -150,7 +150,7 @@ objspace_info(VALUE obj, VALUE target_hash)
   }
 
   rb_objspace_reachable_objects_from(obj, reachable_object_i, (void*)references);
-  rb_ary_delete(references, PTR2FIX(obj_klass));
+  rb_ary_delete(references, rb_obj_id(obj_klass));
   HASH_SET("references", references);
 
   if ((ainfo = objspace_lookup_allocation_info(obj))) {

data/lib/objspace_helpers/helpers.rb

@@ -8,21 +8,13 @@ class ObjspaceHelpers
   end
 
   def self.info_for_obj(obj)
-    _addresses_to_info([address_of(obj)]).values.first
-  end
-
-  def self.obj_for(address)
-    _obj_for_address(address)
-  end
-
-  def self.address_of(obj)
-    _address_of_obj(obj)
+    _addresses_to_info([obj.object_id]).values.first
   end
 
   def self.diff(&block)
     objs_before = dump_all_addresses
     block.call
     objs_after = dump_all_addresses
-    objs_after - objs_before - [address_of(objs_after)]
+    objs_after - objs_before - [objs_after.object_id]
   end
 end

data/lib/objspace_helpers/version.rb

@@ -1,3 +1,3 @@
 class ObjspaceHelpers
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/objspace_helpers.rb

@@ -4,3 +4,5 @@ require 'objspace_helpers/version'
 require 'objspace_helpers/objspace_helpers'
 
 require 'objspace_helpers/helpers'
+require 'objspace_helpers/leaks'
+require 'objspace_helpers/tracked_object'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: objspace_helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Helper library to work with ObjectSpace in MRI Ruby 2.1+