therubyracer 0.9.0beta3 → 0.9.0beta4

data/bin/therubyracer

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$:.unshift(lib) if File.exists?(lib) unless $:.member?(lib)
 
 begin
   require 'v8'

data/ext/v8/rr.cpp

@@ -40,6 +40,13 @@ VALUE rr_const_get(const char *name) {
   return rb_const_get(V8_C, rb_intern(name));
 }
 
+VALUE rr_define_finalizer(VALUE object, void* finalizer, VALUE data) {
+  VALUE finalizer_proc = rb_proc_new((VALUE (*)(...))finalizer, data);
+  rb_iv_set(finalizer_proc, "data", data);
+  VALUE ospace = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
+  rb_funcall(ospace, rb_intern("define_finalizer"), 2, object, finalizer_proc);
+}
+
 VALUE rr_v82rb(Handle<Value> value) {
   if (value.IsEmpty()) {
     return rr_v8_value_empty();

data/ext/v8/rr.h

@@ -11,6 +11,10 @@ VALUE rr_define_class(const char *name, VALUE superclass = rb_cObject);
 VALUE rr_define_module(const char *name);
 VALUE rr_define_const(const char *name, VALUE value);
 VALUE rr_const_get(const char *name);
+VALUE rr_define_finalizer(VALUE object, void* finalizer, VALUE data);
+
+extern "C" VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
+
 
 VALUE rr_v82rb(v8::Handle<v8::Value> value);
 VALUE rr_v82rb(v8::Handle<v8::Boolean> value);

data/ext/v8/v8_weakref.cpp

@@ -4,6 +4,8 @@
 using namespace v8;
 
 v8_weakref::v8_weakref(VALUE object) {
+  this->v8_active = true;
+  this->rb_active = true;
   this->external = Persistent<External>::New(External::New((void *)this));
   this->external.MakeWeak(this, v8_weakref_dispose);
   this->set(object);
@@ -11,9 +13,9 @@ v8_weakref::v8_weakref(VALUE object) {
 
 void v8_weakref::set(VALUE value) {
   this->object_id = rb_obj_id(value);
+  this->rb_active = true;
   VALUE data = Data_Wrap_Struct(rb_cObject, 0, 0, this);
-  VALUE finalizer = rb_proc_new((VALUE (*)(...))v8_weakref_finalize, data);
-  rb_funcall(v8_weakref_objectspace(), rb_intern("define_finalizer"), 2, value, finalizer);
+  rr_define_finalizer(value,(void*)v8_weakref_finalize, data);
 }
 
 VALUE v8_weakref::get() {
@@ -28,13 +30,21 @@ VALUE v8_weakref_finalize(VALUE object_id, VALUE data) {
   v8_weakref* weakref = 0;
   Data_Get_Struct(data, struct v8_weakref, weakref);
   weakref->object_id = Qnil;
+  weakref->rb_active = false;
+  if (!weakref->v8_active) {
+    delete weakref;
+  }
   return Qnil;
 }
 
-void v8_weakref_dispose(Persistent<Value> value, void* weakref) {
+void v8_weakref_dispose(Persistent<Value> value, void* data) {
   value.Dispose();
   value.Clear();
-  delete (v8_weakref*)weakref;
+  v8_weakref* weakref = (v8_weakref*)data;
+  weakref->v8_active = false;
+  if (!weakref->rb_active) {
+    delete weakref;
+  }
 }
 
 VALUE v8_weakref_nil(VALUE nil, VALUE exception) {

data/ext/v8/v8_weakref.h

@@ -3,6 +3,7 @@
 
 #include <v8.h>
 #include "ruby.h"
+#include "rr.h"
 
 struct v8_weakref  {
   v8_weakref(VALUE object);
@@ -12,6 +13,8 @@ struct v8_weakref  {
   void release();
 
   VALUE object_id;
+  bool v8_active;
+  bool rb_active;
   v8::Persistent<v8::External> external;
 };
 
@@ -21,6 +24,6 @@ VALUE v8_weakref_objectspace();
 VALUE v8_weakref_nil(VALUE nil, VALUE exception);
 VALUE v8_weakref_id2ref(VALUE id);
 
-extern "C" VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
+// extern "C" VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
 
 #endif

data/lib/v8/portal/proxies.rb

@@ -43,6 +43,7 @@ module V8
         @js_proxies_js2rb[proxy] = target
         @js_proxies_rb2js[target] = proxy
         proxy.MakeWeak(nil, @clear_js_proxy)
+        V8::C::V8::AdjustAmountOfExternalAllocatedMemory(16 * 1024)
       end
 
       def rb_object_2_js_proxy(object)
@@ -59,6 +60,7 @@ module V8
         @rb_proxies_rb2js[proxy.object_id] = target
         @rb_proxies_js2rb[target] = proxy.object_id
         ObjectSpace.define_finalizer(proxy, @clear_rb_proxy)
+        V8::C::V8::AdjustAmountOfExternalAllocatedMemory(8 * 1024)
       end
 
       def js_object_2_rb_proxy(object)
@@ -71,6 +73,17 @@ module V8
         @rb_proxies_rb2js[proxy.object_id]
       end
 
+      def js_empty?
+        @js_proxies_rb2js.empty? && @js_proxies_js2rb.empty?
+      end
+
+      def rb_empty?
+        @rb_proxies_rb2js.empty? && @rb_proxies_js2rb.empty?
+      end
+
+      def empty?
+        js_empty? && rb_empty?
+      end
       DoubleProxyError = Class.new(StandardError)
 
       class ClearJSProxy
@@ -83,6 +96,7 @@ module V8
           rb = @js2rb[proxy]
           @js2rb.delete(proxy)
           @rb2js.delete(rb)
+          V8::C::V8::AdjustAmountOfExternalAllocatedMemory(-16 * 1024)
         end
       end
 
@@ -95,6 +109,7 @@ module V8
           js = @rb2js[proxy_id]
           @rb2js.delete(proxy_id)
           @js2rb.delete(js)
+          V8::C::V8::AdjustAmountOfExternalAllocatedMemory(-8 * 1024)
         end
       end
     end

data/lib/v8/version.rb

@@ -1,3 +1,3 @@
 module V8
-  VERSION = "0.9.0beta3"
+  VERSION = "0.9.0beta4"
 end

data/specmem/object_memspec.rb

@@ -5,10 +5,8 @@ describe V8::C::Object do
   include V8::MemSpec
   it "will return a new peer and not barf if the old peer has been garbage collected" do
     v8_eval('var o = {foo: "bar"}')
-    o = v8_eval('o')
-    old_id = o.object_id
+    old_id = v8_eval('o').object_id
     ruby_gc do
-      o = nil
       v8_eval('o').Get(c::String::New("foo")).Utf8Value().should == "bar"
       v8_eval('o').object_id.should_not be(old_id)
     end

data/specmem/proxies_memspec.rb

@@ -5,82 +5,44 @@ describe V8::Portal::Proxies do
   
   context "A Ruby object embedded into JavaScript" do
     it "holds a hard reference to any ruby object which is linked to a javascript proxy" do
-      rb_object = Object.new
-      check_not_finalized(rb_object)
-      subject.register_javascript_proxy c::Object::New(), :for => rb_object
-      rb_object = nil
+      subject.register_javascript_proxy c::Object::New(), :for => Object.new
+      ruby_gc do
+        subject.should_not be_empty
+      end
     end
 
     it "releases the hard reference if its corresponding javascript object has been garbage collected" do
       rb_object = Object.new
       js_proxy = c::Object::New()
-      check_finalized(rb_object)
       subject.register_javascript_proxy js_proxy, :for => rb_object
       rb_object = nil
       ruby_gc do
+        subject.should_not be_empty
         v8_gc()
       end
+      subject.should be_empty
     end
   end
 
   context "A JavaScript object embedded into Ruby" do
     it "holds a hard reference to any JavaScript object which is linked to a Ruby proxy" do
-      js_object = c::Object::New()
-      check_not_finalized(js_object)
-      subject.register_ruby_proxy Object.new, :for => js_object
-      js_object = nil
+      proxy = Object.new
+      subject.register_ruby_proxy proxy, :for => c::Object::New()
+      ruby_gc do
+        subject.should_not be_empty
+      end
     end
 
     it "clears any strong references to the JavaScript object when it's Ruby proxy is garbage collected" do
-      js_object = c::Object::New()
-      rb_proxy = Object.new
-      subject.register_ruby_proxy rb_proxy, :for => js_object
-      check_finalized(js_object)
-      js_object = rb_proxy = nil
+      subject.register_ruby_proxy Object.new, :for => c::Object::New()
+      subject.should_not be_empty
       ruby_gc do
         v8_gc
         GC.start
         v8_gc
       end
-    end
-  end
-  private
-
-  def finalize(object_id)
-    @finalized ||= {}
-    @finalized[object_id] = true
-  end
-
-  def check_finalized(object)
-    @finalized ||= {}
-    ObjectSpace.define_finalizer(object, method(:finalize))
-    id_to_check = object.object_id
-    object = nil
-    afterwards do
-      @finalized[id_to_check].should be_true
-    end
-  end
-
-  def check_not_finalized(object)
-    @finalized ||= {}
-    ObjectSpace.define_finalizer(object, method(:finalize))
-    id_to_check = object.object_id
-    object = nil
-    afterwards do
-      @finalized[id_to_check].should be_false
+      subject.should be_empty
     end
   end
 
-  def afterwards(&block)
-    @after ||= []
-    @after << block if block_given?
-  end
-
-  after do
-    ruby_gc do
-      @after.each do |proc|
-        proc.call
-      end if @after
-    end
-  end
 end

data/therubyracer.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/v8/extconf.rb"]
   s.require_paths = ["lib", "ext"]
 
+  s.add_development_dependency "rake", "~> 0.8.7"
   s.add_development_dependency "rspec", ">= 2.0.0"
   s.add_development_dependency "rake-compiler"
 end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: therubyracer
 version: !ruby/object:Gem::Version 
+  hash: 62196283
   prerelease: 5
-  version: 0.9.0beta3
+  segments: 
+  - 0
+  - 9
+  - 0
+  - beta
+  - 4
+  version: 0.9.0beta4
 platform: ruby
 authors: 
 - Charles Lowell
@@ -11,31 +18,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -05:00
+date: 2011-05-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
+  prerelease: false
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 description: Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.
 email: cowboyd@thefrontside.net
 executables: 
@@ -909,7 +940,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2732693164183686551
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -918,6 +949,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []