therubyracer 0.9.1 → 0.9.2beta1

data/ext/v8/v8_handle.cpp

@@ -8,14 +8,34 @@ using namespace v8;
 * Creates a new Persistent storage cell for `handle`
 * so that we can reference it from Ruby.
 */
-v8_handle::v8_handle(Handle<void> handle) : handle(Persistent<void>::New(handle)) {
+v8_handle::v8_handle(Handle<void> object) {
   this->weakref_callback = Qnil;
   this->weakref_callback_parameters = Qnil;
   this->dead = false;
+  this->payload = new Payload(object);
 }
 
 v8_handle::~v8_handle() {}
 
+v8_handle::Payload::Payload(Handle<void> object) {
+  rb_gc_register_address(&wrapper);
+  handle = Persistent<void>::New(object);
+  wrapper = Data_Wrap_Struct(rb_cObject, 0, destroy, this);
+}
+
+v8_handle::Payload::~Payload() {
+  rb_gc_unregister_address(&wrapper);
+}
+
+void v8_handle::Payload::release() {
+  handle.Dispose();
+  handle.Clear();
+}
+
+void v8_handle::Payload::destroy(v8_handle::Payload* payload) {
+  delete payload;
+}
+
 namespace {
   /**
   * Holds dead references, that are no longer being held in Ruby, so that they can be garbage collected
@@ -33,14 +53,6 @@ namespace {
     rb_gc_mark(handle->weakref_callback_parameters);
   }
 
-  /**
-  * Deallocates this handle. This function is invoked on Zombie handles after they have
-  * been released from V8 and finally
-  */
-  void v8_handle_free(v8_handle* handle) {
-    delete handle;
-  }
-
   /**
   * Whenver a V8::C::Handle becomes garbage collected, we do not free it immediately.
   * instead, we put them into a "zombie" queue, where its corresponding V8 storage cell
@@ -49,8 +61,7 @@ namespace {
   */
   void v8_handle_enqueue(v8_handle* handle) {
     handle->dead = true;
-    VALUE zombie = Data_Wrap_Struct(rr_v8_handle_class(), 0, v8_handle_free, handle);
-    rb_ary_unshift(handle_queue, zombie);
+    rb_ary_unshift(handle_queue, handle->payload->wrapper);
   }
 
   /**
@@ -63,10 +74,9 @@ namespace {
   */
   void v8_handle_dequeue(GCType type, GCCallbackFlags flags) {
     for (VALUE handle = rb_ary_pop(handle_queue); RTEST(handle); handle = rb_ary_pop(handle_queue)) {
-      v8_handle* dead = NULL;
-      Data_Get_Struct(handle, struct v8_handle, dead);
-      dead->handle.Dispose();
-      dead->handle.Clear();
+      v8_handle::Payload* payload = NULL;
+      Data_Get_Struct(handle, struct v8_handle::Payload, payload);
+      payload->release();
     }
   }
 
@@ -102,8 +112,7 @@ namespace {
       rb_funcall(callback, rb_intern("call"), 2, self, parameters);
     }
     value.Dispose();
-    handle->handle.Dispose();
-    handle->handle.Clear();
+    handle->payload->release();
     handle->dead = true;
 
   }
@@ -146,8 +155,8 @@ void rr_init_handle() {
   rr_define_method(HandleClass, "IsNearDeath", IsNearDeath, 0);
   rr_define_method(HandleClass, "IsWeak", IsWeak, 0);
 
-  handle_queue = rb_ary_new();
   rb_gc_register_address(&handle_queue);
+  handle_queue = rb_ary_new();
   V8::AddGCPrologueCallback(v8_handle_dequeue);
 }
 

data/ext/v8/v8_handle.h

@@ -1,5 +1,5 @@
 #ifndef _RR_V8_HANDLE_
-#define _RR_V8_HANDLE_ 
+#define _RR_V8_HANDLE_
 
 #include <v8.h>
 #include "ruby.h"
@@ -9,10 +9,20 @@
 * class for all of the low-level proxies that reference into V8
 */
 struct v8_handle  {
+
+  struct Payload {
+    Payload(v8::Handle<void> object);
+    virtual ~Payload();
+    void release();
+    static void destroy(v8_handle::Payload* payload);
+    v8::Persistent<void> handle;
+    VALUE wrapper;
+  };
+
   v8_handle(v8::Handle<void> object);
   virtual ~v8_handle();
 
-  v8::Persistent<void> handle;
+  Payload* payload;
   bool dead;
   VALUE weakref_callback;
   VALUE weakref_callback_parameters;
@@ -23,7 +33,7 @@ void rr_init_handle();
 v8_handle* rr_v8_handle_raw(VALUE value);
 
 template <class T> v8::Persistent<T>& rr_v8_handle(VALUE value) {
-  return (v8::Persistent<T>&)(rr_v8_handle_raw(value)->handle);
+  return (v8::Persistent<T>&)(rr_v8_handle_raw(value)->payload->handle);
 }
 VALUE rr_v8_handle_new(VALUE rbclass, v8::Handle<void> handle);
 VALUE rr_v8_handle_class();

data/lib/v8/version.rb

@@ -1,3 +1,3 @@
 module V8
-  VERSION = "0.9.1"
+  VERSION = "0.9.2beta1"
 end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: therubyracer
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.1
+  hash: 62196257
+  prerelease: 5
+  segments: 
+  - 0
+  - 9
+  - 2
+  - beta
+  - 1
+  version: 0.9.2beta1
 platform: ruby
 authors: 
 - Charles Lowell
@@ -11,53 +18,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -05:00
+date: 2011-06-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: libv8
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 3
+        - 3
+        - 10
         version: 3.3.10
-  type: :runtime
-  prerelease: false
   version_requirements: *id001
+  name: libv8
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-  type: :development
-  prerelease: false
   version_requirements: *id002
+  name: rake
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
-  type: :development
-  prerelease: false
   version_requirements: *id003
+  name: rspec
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
-  prerelease: false
   version_requirements: *id004
+  name: rake-compiler
+  prerelease: false
 description: Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.
 email: cowboyd@thefrontside.net
 executables: 
@@ -174,19 +198,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3522882523621608294
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: -3522882523621608294
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: therubyracer