From 01c3d0aa888e3a2bf709da760588df191479b922 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sun, 6 Jan 2013 23:52:35 +0100 Subject: [PATCH] src: pass node_isolate to Local<>::New --- src/cares_wrap.cc | 6 +++--- src/fs_event_wrap.cc | 3 ++- src/node.cc | 6 +++--- src/node_buffer.cc | 2 +- src/node_crypto.cc | 13 +++++++------ src/node_file.cc | 2 +- src/node_script.cc | 2 +- src/node_zlib.cc | 3 ++- src/pipe_wrap.cc | 8 ++++---- src/stream_wrap.cc | 8 ++++---- src/tcp_wrap.cc | 10 +++++----- src/udp_wrap.cc | 8 ++++---- 12 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index bf2f643a75..8445ec4642 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -677,7 +677,7 @@ static Handle Query(const Arguments& args) { // We must cache the wrap's js object here, because cares might make the // callback from the wrap->Send stack. This will destroy the wrap's internal // object reference, causing wrap->GetObject() to return undefined. - Local object = Local::New(wrap->GetObject()); + Local object = Local::New(node_isolate, wrap->GetObject()); String::Utf8Value name(args[0]); @@ -706,7 +706,7 @@ static Handle QueryWithFamily(const Arguments& args) { // We must cache the wrap's js object here, because cares might make the // callback from the wrap->Send stack. This will destroy the wrap's internal // object reference, causing wrap->GetObject() to return undefined. - Local object = Local::New(wrap->GetObject()); + Local object = Local::New(node_isolate, wrap->GetObject()); String::Utf8Value name(args[0]); int family = args[1]->Int32Value(); @@ -732,7 +732,7 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) { if (status) { // Error SetErrno(uv_last_error(uv_default_loop())); - argv[0] = Local::New(Null()); + argv[0] = Local::New(node_isolate, Null()); } else { // Success struct addrinfo *address; diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc index cf4dd0b89a..5bed7d094c 100644 --- a/src/fs_event_wrap.cc +++ b/src/fs_event_wrap.cc @@ -152,7 +152,8 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename, Local argv[3] = { Integer::New(status, node_isolate), eventStr, - filename ? (Local)String::New(filename) : Local::New(v8::Null()) + filename ? static_cast >(String::New(filename)) + : Local::New(node_isolate, v8::Null()) }; if (onchange_sym.IsEmpty()) { diff --git a/src/node.cc b/src/node.cc index 08c5b794ee..f3a5d5bb98 100644 --- a/src/node.cc +++ b/src/node.cc @@ -947,8 +947,8 @@ MakeCallback(const Handle object, argArray->Set(Integer::New(i, node_isolate), argv[i]); } - Local object_l = Local::New(object); - Local callback_l = Local::New(callback); + Local object_l = Local::New(node_isolate, object); + Local callback_l = Local::New(node_isolate, callback); Local args[3] = { object_l, callback_l, argArray }; @@ -2401,7 +2401,7 @@ void Load(Handle process_l) { // Add a reference to the global object Local global = v8::Context::GetCurrent()->Global(); - Local args[1] = { Local::New(process_l) }; + Local args[1] = { Local::New(node_isolate, process_l) }; #if defined HAVE_DTRACE || defined HAVE_ETW || defined HAVE_SYSTEMTAP InitDTrace(global); diff --git a/src/node_buffer.cc b/src/node_buffer.cc index aa600ffeac..a4d0532aba 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -116,7 +116,7 @@ Handle Buffer::New(Handle string) { assert(bv->IsFunction()); Local b = Local::Cast(bv); - Local argv[1] = { Local::New(string) }; + Local argv[1] = { Local::New(node_isolate, string) }; Local instance = b->NewInstance(1, argv); return scope.Close(instance); diff --git a/src/node_crypto.cc b/src/node_crypto.cc index ec9ecaa6e6..1136a3d4c6 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -1137,7 +1137,8 @@ int Connection::SelectSNIContextCallback_(SSL *s, int *ad, void* arg) { Local argv[1] = {*p->servername_}; // Call it - Local ret = Local::New(MakeCallback(p->sniObject_, + Local ret = Local::New(node_isolate, + MakeCallback(p->sniObject_, "onselect", ARRAY_SIZE(argv), argv)); @@ -3713,12 +3714,12 @@ void EIO_PBKDF2(uv_work_t* work_req) { void EIO_PBKDF2After(pbkdf2_req* req, Local argv[2]) { if (req->err) { - argv[0] = Local::New(Undefined()); + argv[0] = Local::New(node_isolate, Undefined()); argv[1] = Encode(req->key, req->keylen, BUFFER); memset(req->key, 0, req->keylen); } else { argv[0] = Exception::Error(String::New("PBKDF2 error")); - argv[1] = Local::New(Undefined()); + argv[1] = Local::New(node_isolate, Undefined()); } delete[] req->pass; @@ -3891,13 +3892,13 @@ void RandomBytesCheck(RandomBytesRequest* req, Local argv[2]) { ERR_error_string_n(req->error_, errmsg, sizeof errmsg); argv[0] = Exception::Error(String::New(errmsg)); - argv[1] = Local::New(Null()); + argv[1] = Local::New(node_isolate, Null()); } else { // avoids the malloc + memcpy Buffer* buffer = Buffer::New(req->data_, req->size_, RandomBytesFree, NULL); - argv[0] = Local::New(Null()); - argv[1] = Local::New(buffer->handle_); + argv[0] = Local::New(node_isolate, Null()); + argv[1] = Local::New(node_isolate, buffer->handle_); } } diff --git a/src/node_file.cc b/src/node_file.cc index ba9c539f13..75fb42ee67 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -113,7 +113,7 @@ static void After(uv_fs_t *req) { } } else { // error value is empty or null for non-error. - argv[0] = Local::New(Null()); + argv[0] = Local::New(node_isolate, Null()); // All have at least two args now. argc = 2; diff --git a/src/node_script.cc b/src/node_script.cc index 15c56122c7..931a9630d3 100644 --- a/src/node_script.cc +++ b/src/node_script.cc @@ -363,7 +363,7 @@ Handle WrappedScript::EvalMachine(const Arguments& args) { // to a local handle, and then dispose the persistent handle. This ensures // that when this function exits the context will be disposed. Persistent tmp = Context::New(); - context = Local::New(tmp); + context = Local::New(node_isolate, tmp); tmp.Dispose(); } else if (context_flag == userContext) { diff --git a/src/node_zlib.cc b/src/node_zlib.cc index 373bf188af..d4bcb95a8f 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -270,7 +270,8 @@ class ZCtx : public ObjectWrap { "Invalid error handler"); HandleScope scope; Local args[2] = { String::New(msg), - Local::New(Number::New(ctx->err_)) }; + Local::New(node_isolate, + Number::New(ctx->err_)) }; MakeCallback(ctx->handle_, onerror_sym, ARRAY_SIZE(args), args); // no hope of rescue. diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index abe9fefea5..fa54db663d 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -239,10 +239,10 @@ void PipeWrap::AfterConnect(uv_connect_t* req, int status) { Local argv[5] = { Integer::New(status, node_isolate), - Local::New(wrap->object_), - Local::New(req_wrap->object_), - Local::New(Boolean::New(readable)), - Local::New(Boolean::New(writable)) + Local::New(node_isolate, wrap->object_), + Local::New(node_isolate, req_wrap->object_), + Local::New(node_isolate, Boolean::New(readable)), + Local::New(node_isolate, Boolean::New(writable)) }; if (oncomplete_sym.IsEmpty()) { diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index 7b87a596f4..05c98ef27f 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -476,8 +476,8 @@ void StreamWrap::AfterWrite(uv_write_t* req, int status) { Local argv[] = { Integer::New(status, node_isolate), - Local::New(wrap->object_), - Local::New(req_wrap->object_) + Local::New(node_isolate, wrap->object_), + Local::New(node_isolate, req_wrap->object_) }; MakeCallback(req_wrap->object_, oncomplete_sym, ARRAY_SIZE(argv), argv); @@ -524,8 +524,8 @@ void StreamWrap::AfterShutdown(uv_shutdown_t* req, int status) { Local argv[3] = { Integer::New(status, node_isolate), - Local::New(wrap->object_), - Local::New(req_wrap->object_) + Local::New(node_isolate, wrap->object_), + Local::New(node_isolate, req_wrap->object_) }; MakeCallback(req_wrap->object_, oncomplete_sym, ARRAY_SIZE(argv), argv); diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc index 4891162ece..898bf90270 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -325,7 +325,7 @@ void TCPWrap::OnConnection(uv_stream_t* handle, int status) { argv[0] = client_obj; } else { SetErrno(uv_last_error(uv_default_loop())); - argv[0] = Local::New(Null()); + argv[0] = Local::New(node_isolate, Null()); } MakeCallback(wrap->object_, onconnection_sym, ARRAY_SIZE(argv), argv); @@ -348,10 +348,10 @@ void TCPWrap::AfterConnect(uv_connect_t* req, int status) { Local argv[5] = { Integer::New(status, node_isolate), - Local::New(wrap->object_), - Local::New(req_wrap->object_), - Local::New(v8::True()), - Local::New(v8::True()) + Local::New(node_isolate, wrap->object_), + Local::New(node_isolate, req_wrap->object_), + Local::New(node_isolate, v8::True()), + Local::New(node_isolate, v8::True()) }; MakeCallback(req_wrap->object_, oncomplete_sym, ARRAY_SIZE(argv), argv); diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc index 23b0074c45..785d348a66 100644 --- a/src/udp_wrap.cc +++ b/src/udp_wrap.cc @@ -337,8 +337,8 @@ void UDPWrap::OnSend(uv_udp_send_t* req, int status) { Local argv[4] = { Integer::New(status, node_isolate), - Local::New(wrap->object_), - Local::New(req_wrap->object_), + Local::New(node_isolate, wrap->object_), + Local::New(node_isolate, req_wrap->object_), req_wrap->object_->GetHiddenValue(buffer_sym), }; @@ -368,14 +368,14 @@ void UDPWrap::OnRecv(uv_udp_t* handle, if (nread == 0) return; if (nread < 0) { - Local argv[] = { Local::New(wrap->object_) }; + Local argv[] = { Local::New(node_isolate, wrap->object_) }; SetErrno(uv_last_error(uv_default_loop())); MakeCallback(wrap->object_, onmessage_sym, ARRAY_SIZE(argv), argv); return; } Local argv[] = { - Local::New(wrap->object_), + Local::New(node_isolate, wrap->object_), slab, Integer::NewFromUnsigned(buf.base - Buffer::Data(slab), node_isolate), Integer::NewFromUnsigned(nread, node_isolate),