jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get memory updates working with Node.js again.

Browse source
This commit is contained in:
Jason Turner 2013-07-27 09:50:03 -06:00 • committed by Oliver Buchtala
commit cf9b7e89ac
2 changed files with 47 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/javascript/v8/javascriptcode.swg
View file

@ -118,6 +118,11 @@ void $jswrapper(v8::Persistent< v8::Value > object, void *parameter)
void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object > * object, SWIGV8_Proxy *proxy) void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object > * object, SWIGV8_Proxy *proxy)
#endif #endif
{ {
#ifdef BUILDING_NODE_EXTENSION
SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
#endif
if(proxy->swigCMemOwn && proxy->swigCObject) { if(proxy->swigCMemOwn && proxy->swigCObject) {
#ifdef SWIGRUNTIME_DEBUG #ifdef SWIGRUNTIME_DEBUG
printf("Deleting wrapped instance: %s\n", proxy->info->name); printf("Deleting wrapped instance: %s\n", proxy->info->name);
@ -126,11 +131,12 @@ void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object > * object, SWI
} }
delete proxy; delete proxy;
object->Clear();
#ifdef BUILDING_NODE_EXTENSION #ifdef BUILDING_NODE_EXTENSION
object->Dispose(); object.Clear();
object.Dispose();
#else #else
object->Clear();
object->Dispose(isolate); object->Dispose(isolate);
#endif #endif
} }
@ -275,7 +281,11 @@ fail:
%fragment("jsv8_define_class_template", "templates") %fragment("jsv8_define_class_template", "templates")
%{ %{
v8::Handle<v8::FunctionTemplate> $jsmangledname_class = SWIGV8_CreateClassTemplate("$jsmangledname"); v8::Handle<v8::FunctionTemplate> $jsmangledname_class = SWIGV8_CreateClassTemplate("$jsmangledname");
#ifdef BUILDING_NODE_EXTENSION
$jsmangledname_clientData.class_templ = v8::Persistent<v8::FunctionTemplate>::New($jsmangledname_class);
#else
$jsmangledname_clientData.class_templ.Reset(v8::Isolate::GetCurrent(), $jsmangledname_class); $jsmangledname_clientData.class_templ.Reset(v8::Isolate::GetCurrent(), $jsmangledname_class);
#endif
$jsmangledname_clientData.dtor = $jsdtor; $jsmangledname_clientData.dtor = $jsdtor;
SWIGTYPE$jsmangledtype->clientdata = &$jsmangledname_clientData; SWIGTYPE$jsmangledtype->clientdata = &$jsmangledname_clientData;
%} %}
@ -423,7 +433,13 @@ void $jsname_initialize(v8::Handle<v8::Object> global_obj)
v8::HandleScope scope; v8::HandleScope scope;
// a class template for creating proxies of undefined types // a class template for creating proxies of undefined types
#ifdef BUILDING_NODE_EXTENSION
SWIGV8_SWIGTYPE_Proxy_class_templ = v8::Persistent<v8::FunctionTemplate>::New(SWIGV8_CreateClassTemplate("SwigProxy"));
#else
SWIGV8_SWIGTYPE_Proxy_class_templ.Reset(v8::Isolate::GetCurrent(), SWIGV8_CreateClassTemplate("SwigProxy")); SWIGV8_SWIGTYPE_Proxy_class_templ.Reset(v8::Isolate::GetCurrent(), SWIGV8_CreateClassTemplate("SwigProxy"));
#endif
/* create objects for namespaces */ /* create objects for namespaces */
$jsv8nspaces $jsv8nspaces

35
Lib/javascript/v8/javascriptruntime.swg
View file

@ -101,7 +101,7 @@ public:
v8::Persistent<v8::FunctionTemplate> class_templ; v8::Persistent<v8::FunctionTemplate> class_templ;
#ifdef BUILDING_NODE_EXTENSION #ifdef BUILDING_NODE_EXTENSION
void (*dtor) (v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy); void (*dtor) (v8::Persistent< v8::Value> object, void *parameter);
#else #else
void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy); void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
#endif #endif
@ -113,7 +113,14 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
v8::HandleScope scope; v8::HandleScope scope;
if(objRef->InternalFieldCount() < 1) return SWIG_ERROR; if(objRef->InternalFieldCount() < 1) return SWIG_ERROR;
#ifdef BUILDING_NODE_EXTENSION
v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0);
SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(v8::External::Unwrap(cdataRef));
#else
SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(objRef->GetAlignedPointerFromInternalField(0)); SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(objRef->GetAlignedPointerFromInternalField(0));
#endif
if(cdata == NULL) { if(cdata == NULL) {
return SWIG_ERROR; return SWIG_ERROR;
} }
@ -135,12 +142,16 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
} }
#ifdef BUILDING_NODE_EXTENSION #ifdef BUILDING_NODE_EXTENSION
void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Value > object, void *parameter)
#else #else
void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy)
#endif #endif
{ {
delete proxy; #ifdef BUILDING_NODE_EXTENSION
SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
#endif
delete proxy;
} }
void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info *info, int flags) { void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info *info, int flags) {
@ -148,11 +159,12 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
cdata->swigCObject = ptr; cdata->swigCObject = ptr;
cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0; cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
cdata->info = info; cdata->info = info;
obj->SetAlignedPointerInInternalField(0, cdata);
#ifdef BUILDING_NODE_EXTENSION #ifdef BUILDING_NODE_EXTENSION
#warning port me obj->SetPointerInInternalField(0, cdata);
cdata->handle = v8::Persistent<v8::Object>::New(obj);
#else #else
obj->SetAlignedPointerInInternalField(0, cdata);
cdata->handle.Reset(v8::Isolate::GetCurrent(), obj); cdata->handle.Reset(v8::Isolate::GetCurrent(), obj);
#endif #endif
@ -186,14 +198,25 @@ int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info
v8::Handle<v8::Object> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) { v8::Handle<v8::Object> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) {
v8::HandleScope scope; v8::HandleScope scope;
v8::Handle<v8::FunctionTemplate> class_templ;
#ifdef BUILDING_NODE_EXTENSION
if(info->clientdata != 0) {
class_templ = ((SWIGV8_ClientData*) info->clientdata)->class_templ;
} else {
class_templ = SWIGV8_SWIGTYPE_Proxy_class_templ;
}
#else
v8::Isolate *iso = v8::Isolate::GetCurrent(); v8::Isolate *iso = v8::Isolate::GetCurrent();
v8::Handle<v8::FunctionTemplate> class_templ;
if(info->clientdata != 0) { if(info->clientdata != 0) {
class_templ = v8::Handle<v8::FunctionTemplate>::New(iso, ((SWIGV8_ClientData*) info->clientdata)->class_templ); class_templ = v8::Handle<v8::FunctionTemplate>::New(iso, ((SWIGV8_ClientData*) info->clientdata)->class_templ);
} else { } else {
class_templ = v8::Handle<v8::FunctionTemplate>::New(iso, SWIGV8_SWIGTYPE_Proxy_class_templ); class_templ = v8::Handle<v8::FunctionTemplate>::New(iso, SWIGV8_SWIGTYPE_Proxy_class_templ);
} }
#endif
v8::Handle<v8::Object> result = class_templ->InstanceTemplate()->NewInstance(); v8::Handle<v8::Object> result = class_templ->InstanceTemplate()->NewInstance();
SWIGV8_SetPrivateData(result, ptr, info, flags); SWIGV8_SetPrivateData(result, ptr, info, flags);