1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify ObjectWrap; make fewer Weak callbacks

Browse Source
This commit is contained in:
Ryan Dahl 2010-01-26 12:00:17 -08:00
parent 741e3fa91b
commit ccd632f278
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/node_object_wrap.h
View File

@ -13,12 +13,10 @@ class ObjectWrap {
} }
virtual ~ObjectWrap ( ) { virtual ~ObjectWrap ( ) {
if (!handle_.IsEmpty()) { assert(handle_.IsNearDeath());
assert(handle_.IsNearDeath()); handle_->SetInternalField(0, v8::Undefined());
handle_->SetInternalField(0, v8::Undefined()); handle_.Dispose();
handle_.Dispose(); handle_.Clear();
handle_.Clear();
}
} }
protected: protected:
@ -37,11 +35,6 @@ class ObjectWrap {
assert(handle->InternalFieldCount() > 0); assert(handle->InternalFieldCount() > 0);
handle_ = v8::Persistent<v8::Object>::New(handle); handle_ = v8::Persistent<v8::Object>::New(handle);
handle_->SetInternalField(0, v8::External::New(this)); handle_->SetInternalField(0, v8::External::New(this));
MakeWeak();
}
inline void MakeWeak (void)
{
handle_.MakeWeak(this, WeakCallback); handle_.MakeWeak(this, WeakCallback);
} }
@ -53,7 +46,6 @@ class ObjectWrap {
assert(!handle_.IsEmpty()); assert(!handle_.IsEmpty());
assert(handle_.IsWeak()); assert(handle_.IsWeak());
refs_++; refs_++;
MakeWeak();
} }
/* Unref() marks an object as detached from the event loop. This is its /* Unref() marks an object as detached from the event loop. This is its
@ -83,8 +75,6 @@ class ObjectWrap {
assert(value == obj->handle_); assert(value == obj->handle_);
if (obj->refs_ == 0) { if (obj->refs_ == 0) {
delete obj; delete obj;
} else {
obj->MakeWeak();
} }
} }
}; };