kotovalexarian-likes-github/therubyracer
1
0
Fork 0
mirror of https://github.com/rubyjs/therubyracer synced 2023-03-27 23:21:42 -04:00
Code Releases Activity

make v8_handle explicitly track weak reference callback.

Browse source
This commit is contained in:
Charles Lowell 2011-05-02 21:54:03 -05:00
parent a3e9b1d0a4
commit 72e7924bf1
2 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ext/v8/v8_handle.cpp
View file

@ -5,7 +5,8 @@
using namespace v8;
v8_handle::v8_handle(Handle<void> handle) : handle(Persistent<void>::New(handle)) {
this->references = rb_hash_new();
this->weakref_callback = Qnil;
this->weakref_callback_parameters = Qnil;
this->dead = false;
}
@ -15,20 +16,13 @@ v8_handle::~v8_handle() {
dead = true;
}
void v8_handle::set_internal(const char* name, VALUE value) {
rb_hash_aset(this->references, rb_str_new2(name), value);
}
VALUE v8_handle::get_internal(const char* name) {
return rb_funcall(this->references, rb_intern("[]"), 1, rb_str_new2(name));
}
namespace {
void gc_mark(v8_handle* handle) {
rb_gc_mark(handle->references);
void v8_handle_mark(v8_handle* handle) {
rb_gc_mark(handle->weakref_callback);
rb_gc_mark(handle->weakref_callback_parameters);
}
void gc_free(v8_handle* handle) {
void v8_handle_free(v8_handle* handle) {
delete handle;
}
@ -58,8 +52,8 @@ namespace {
void RubyWeakReferenceCallback(Persistent<Value> value, void* parameter) {
VALUE self = (VALUE)parameter;
v8_handle* handle = rr_v8_handle_raw(self);
VALUE callback = rr_v8_handle_get_internal(self, "weakref_callback");
VALUE parameters = rr_v8_handle_get_internal(self, "weakref_callback_parameters");
VALUE callback = handle->weakref_callback;
VALUE parameters = handle->weakref_callback_parameters;
if (RTEST(callback)) {
rb_funcall(callback, rb_intern("call"), 2, self, parameters);
}
@ -71,8 +65,9 @@ namespace {
}
VALUE MakeWeak(VALUE self, VALUE parameters, VALUE callback) {
rr_v8_handle_set_internal(self,"weakref_callback", callback);
rr_v8_handle_set_internal(self, "weakref_callback_parameters", parameters);
v8_handle* handle = rr_v8_handle_raw(self);
handle->weakref_callback = callback;
handle->weakref_callback_parameters = parameters;
rr_v8_handle<void>(self).MakeWeak((void*)self, RubyWeakReferenceCallback);
return Qnil;
}
@ -109,21 +104,14 @@ void rr_init_handle() {
}
VALUE rr_v8_handle_new(VALUE klass, v8::Handle<void> handle) {
return Data_Wrap_Struct(klass, gc_mark, gc_free, new v8_handle(handle));
v8_handle* new_handle = new v8_handle(handle);
return Data_Wrap_Struct(klass, v8_handle_mark, v8_handle_free, new_handle);
}
VALUE rr_v8_handle_class() {
return rr_define_class("Handle");
}
void rr_v8_handle_set_internal(VALUE handle, const char* name, VALUE value) {
rr_v8_handle_raw(handle)->set_internal(name, value);
}
VALUE rr_v8_handle_get_internal(VALUE handle, const char* name) {
return rr_v8_handle_raw(handle)->get_internal(name);
}
v8_handle* rr_v8_handle_raw(VALUE value) {
v8_handle* handle = 0;
Data_Get_Struct(value, struct v8_handle, handle);

9
ext/v8/v8_handle.h
View file

@ -7,12 +7,11 @@
struct v8_handle {
v8_handle(v8::Handle<void> object);
virtual ~v8_handle();
VALUE get_internal(const char* name);
void set_internal(const char* name, VALUE value);
v8::Persistent<void> handle;
bool dead;
VALUE references;
VALUE weakref_callback;
VALUE weakref_callback_parameters;
};
void rr_init_handle();
@ -25,8 +24,4 @@ template <class T> v8::Persistent<T>& rr_v8_handle(VALUE value) {
VALUE rr_v8_handle_new(VALUE rbclass, v8::Handle<void> handle);
VALUE rr_v8_handle_class();
void rr_v8_handle_set_internal(VALUE handle, const char* name, VALUE value);
VALUE rr_v8_handle_get_internal(VALUE handle, const char* name);
#endif