diff options
| -rw-r--r-- | src/cares_wrap.cc | 99 | ||||
| -rw-r--r-- | src/fs_event_wrap.cc | 20 | ||||
| -rw-r--r-- | src/handle_wrap.cc | 16 | ||||
| -rw-r--r-- | src/node.cc | 219 | ||||
| -rw-r--r-- | src/node_buffer.cc | 108 | ||||
| -rw-r--r-- | src/node_counters.cc | 14 | ||||
| -rw-r--r-- | src/node_crypto.cc | 350 | ||||
| -rw-r--r-- | src/node_dtrace.cc | 48 | ||||
| -rw-r--r-- | src/node_file.cc | 108 | ||||
| -rw-r--r-- | src/node_http_parser.cc | 48 | ||||
| -rw-r--r-- | src/node_javascript.cc | 2 | ||||
| -rw-r--r-- | src/node_os.cc | 46 | ||||
| -rw-r--r-- | src/node_script.cc | 20 | ||||
| -rw-r--r-- | src/node_stat_watcher.cc | 16 | ||||
| -rw-r--r-- | src/node_string.cc | 4 | ||||
| -rw-r--r-- | src/node_zlib.cc | 29 | ||||
| -rw-r--r-- | src/pipe_wrap.cc | 38 | ||||
| -rw-r--r-- | src/process_wrap.cc | 18 | ||||
| -rw-r--r-- | src/signal_wrap.cc | 16 | ||||
| -rw-r--r-- | src/slab_allocator.cc | 12 | ||||
| -rw-r--r-- | src/stream_wrap.cc | 60 | ||||
| -rw-r--r-- | src/tcp_wrap.cc | 70 | ||||
| -rw-r--r-- | src/timer_wrap.cc | 28 | ||||
| -rw-r--r-- | src/tty_wrap.cc | 26 | ||||
| -rw-r--r-- | src/udp_wrap.cc | 63 | ||||
| -rw-r--r-- | src/v8_typed_array.cc | 68 |
26 files changed, 782 insertions, 764 deletions
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index fa6302b1b2..d9b4e18849 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -195,7 +195,7 @@ static void ares_sockstate_cb(void* data, ares_socket_t sock, static Local<Array> HostentToAddresses(struct hostent* host) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Array> addresses = Array::New(); char ip[INET6_ADDRSTRLEN]; @@ -203,7 +203,7 @@ static Local<Array> HostentToAddresses(struct hostent* host) { uv_inet_ntop(host->h_addrtype, host->h_addr_list[i], ip, sizeof(ip)); Local<String> address = String::New(ip); - addresses->Set(Integer::New(i), address); + addresses->Set(Integer::New(i, node_isolate), address); } return scope.Close(addresses); @@ -211,12 +211,12 @@ static Local<Array> HostentToAddresses(struct hostent* host) { static Local<Array> HostentToNames(struct hostent* host) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Array> names = Array::New(); for (int i = 0; host->h_aliases[i]; ++i) { Local<String> address = String::New(host->h_aliases[i]); - names->Set(Integer::New(i), address); + names->Set(Integer::New(i, node_isolate), address); } return scope.Close(names); @@ -260,7 +260,7 @@ static const char* AresErrnoString(int errorno) { static void SetAresErrno(int errorno) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> key = String::NewSymbol("_errno"); Local<Value> value = String::NewSymbol(AresErrnoString(errorno)); node::process->Set(key, value); @@ -270,7 +270,7 @@ static void SetAresErrno(int errorno) { class QueryWrap { public: QueryWrap() { - HandleScope scope; + HandleScope scope(node_isolate); object_ = Persistent<Object>::New(node_isolate, Object::New()); } @@ -336,14 +336,14 @@ class QueryWrap { } void CallOnComplete(Local<Value> answer) { - HandleScope scope; - Local<Value> argv[2] = { Integer::New(0), answer }; + HandleScope scope(node_isolate); + Local<Value> argv[2] = { Integer::New(0, node_isolate), answer }; MakeCallback(object_, oncomplete_sym, ARRAY_SIZE(argv), argv); } void CallOnComplete(Local<Value> answer, Local<Value> family) { - HandleScope scope; - Local<Value> argv[3] = { Integer::New(0), answer, family }; + HandleScope scope(node_isolate); + Local<Value> argv[3] = { Integer::New(0, node_isolate), answer, family }; MakeCallback(object_, oncomplete_sym, ARRAY_SIZE(argv), argv); } @@ -351,8 +351,8 @@ class QueryWrap { assert(status != ARES_SUCCESS); SetAresErrno(status); - HandleScope scope; - Local<Value> argv[1] = { Integer::New(-1) }; + HandleScope scope(node_isolate); + Local<Value> argv[1] = { Integer::New(-1, node_isolate) }; MakeCallback(object_, oncomplete_sym, ARRAY_SIZE(argv), argv); } @@ -379,7 +379,7 @@ class QueryAWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope; + HandleScope scope(node_isolate); struct hostent* host; @@ -411,7 +411,7 @@ class QueryAaaaWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope; + HandleScope scope(node_isolate); struct hostent* host; @@ -443,7 +443,7 @@ class QueryCnameWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope; + HandleScope scope(node_isolate); struct hostent* host; @@ -473,7 +473,7 @@ class QueryMxWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope; + HandleScope scope(node_isolate); struct ares_mx_reply* mx_start; int status = ares_parse_mx_reply(buf, len, &mx_start); @@ -492,8 +492,8 @@ class QueryMxWrap: public QueryWrap { Local<Object> mx_record = Object::New(); mx_record->Set(exchange_symbol, String::New(mx_current->host)); mx_record->Set(priority_symbol, - Integer::New(mx_current->priority)); - mx_records->Set(Integer::New(i++), mx_record); + Integer::New(mx_current->priority, node_isolate)); + mx_records->Set(Integer::New(i++, node_isolate), mx_record); } ares_free_data(mx_start); @@ -550,7 +550,7 @@ class QueryTxtWrap: public QueryWrap { struct ares_txt_reply *current = txt_out; for (int i = 0; current; ++i, current = current->next) { Local<String> txt = String::New(reinterpret_cast<char*>(current->txt)); - txt_records->Set(Integer::New(i), txt); + txt_records->Set(Integer::New(i, node_isolate), txt); } ares_free_data(txt_out); @@ -574,7 +574,7 @@ class QuerySrvWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope; + HandleScope scope(node_isolate); struct ares_srv_reply* srv_start; int status = ares_parse_srv_reply(buf, len, &srv_start); @@ -595,12 +595,12 @@ class QuerySrvWrap: public QueryWrap { Local<Object> srv_record = Object::New(); srv_record->Set(name_symbol, String::New(srv_current->host)); srv_record->Set(port_symbol, - Integer::New(srv_current->port)); + Integer::New(srv_current->port, node_isolate)); srv_record->Set(priority_symbol, - Integer::New(srv_current->priority)); + Integer::New(srv_current->priority, node_isolate)); srv_record->Set(weight_symbol, - Integer::New(srv_current->weight)); - srv_records->Set(Integer::New(i++), srv_record); + Integer::New(srv_current->weight, node_isolate)); + srv_records->Set(Integer::New(i++, node_isolate), srv_record); } ares_free_data(srv_start); @@ -623,7 +623,7 @@ class QueryNaptrWrap: public QueryWrap { protected: void Parse(unsigned char* buf, int len) { - HandleScope scope; + HandleScope scope(node_isolate); ares_naptr_reply* naptr_start; int status = ares_parse_naptr_reply(buf, len, &naptr_start); @@ -656,11 +656,12 @@ class QueryNaptrWrap: public QueryWrap { String::New(reinterpret_cast<char*>(naptr_current->regexp))); naptr_record->Set(replacement_symbol, String::New(naptr_current->replacement)); - naptr_record->Set(order_symbol, Integer::New(naptr_current->order)); + naptr_record->Set(order_symbol, Integer::New(naptr_current->order, + node_isolate)); naptr_record->Set(preference_symbol, - Integer::New(naptr_current->preference)); + Integer::New(naptr_current->preference, node_isolate)); - naptr_records->Set(Integer::New(i++), naptr_record); + naptr_records->Set(Integer::New(i++, node_isolate), naptr_record); } ares_free_data(naptr_start); @@ -697,7 +698,7 @@ class GetHostByAddrWrap: public QueryWrap { protected: void Parse(struct hostent* host) { - HandleScope scope; + HandleScope scope(node_isolate); this->CallOnComplete(HostentToNames(host)); } @@ -713,10 +714,10 @@ class GetHostByNameWrap: public QueryWrap { protected: void Parse(struct hostent* host) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Array> addresses = HostentToAddresses(host); - Local<Integer> family = Integer::New(host->h_addrtype); + Local<Integer> family = Integer::New(host->h_addrtype, node_isolate); this->CallOnComplete(addresses, family); } @@ -725,7 +726,7 @@ class GetHostByNameWrap: public QueryWrap { template <class Wrap> static Handle<Value> Query(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); assert(!args.IsConstructCall()); assert(args.Length() >= 2); @@ -737,7 +738,7 @@ static Handle<Value> 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> object = Local<Object>::New(wrap->GetObject()); + Local<Object> object = Local<Object>::New(node_isolate, wrap->GetObject()); String::Utf8Value name(args[0]); @@ -745,7 +746,7 @@ static Handle<Value> Query(const Arguments& args) { if (r) { SetAresErrno(r); delete wrap; - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } else { return scope.Close(object); } @@ -754,7 +755,7 @@ static Handle<Value> Query(const Arguments& args) { template <class Wrap> static Handle<Value> QueryWithFamily(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); assert(!args.IsConstructCall()); assert(args.Length() >= 3); @@ -766,7 +767,7 @@ static Handle<Value> 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> object = Local<Object>::New(wrap->GetObject()); + Local<Object> object = Local<Object>::New(node_isolate, wrap->GetObject()); String::Utf8Value name(args[0]); int family = args[1]->Int32Value(); @@ -775,7 +776,7 @@ static Handle<Value> QueryWithFamily(const Arguments& args) { if (r) { SetAresErrno(r); delete wrap; - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } else { return scope.Close(object); } @@ -783,7 +784,7 @@ static Handle<Value> QueryWithFamily(const Arguments& args) { void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) { - HandleScope scope; + HandleScope scope(node_isolate); GetAddrInfoReqWrap* req_wrap = (GetAddrInfoReqWrap*) req->data; @@ -792,7 +793,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<Value>::New(Null()); + argv[0] = Local<Value>::New(node_isolate, Null(node_isolate)); } else { // Success struct addrinfo *address; @@ -878,25 +879,25 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) { static Handle<Value> IsIP(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); String::AsciiValue ip(args[0]); char address_buffer[sizeof(struct in6_addr)]; if (uv_inet_pton(AF_INET, *ip, &address_buffer).code == UV_OK) { - return scope.Close(v8::Integer::New(4)); + return scope.Close(v8::Integer::New(4, node_isolate)); } if (uv_inet_pton(AF_INET6, *ip, &address_buffer).code == UV_OK) { - return scope.Close(v8::Integer::New(6)); + return scope.Close(v8::Integer::New(6, node_isolate)); } - return scope.Close(v8::Integer::New(0)); + return scope.Close(v8::Integer::New(0, node_isolate)); } static Handle<Value> GetAddrInfo(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); String::Utf8Value hostname(args[0]); @@ -931,7 +932,7 @@ static Handle<Value> GetAddrInfo(const Arguments& args) { if (r) { SetErrno(uv_last_error(uv_default_loop())); delete req_wrap; - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } else { return scope.Close(req_wrap->object_); } @@ -939,7 +940,7 @@ static Handle<Value> GetAddrInfo(const Arguments& args) { static void Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); int r; r = ares_library_init(ARES_LIB_INIT_ALL); @@ -976,11 +977,11 @@ static void Initialize(Handle<Object> target) { NODE_SET_METHOD(target, "isIP", IsIP); target->Set(String::NewSymbol("AF_INET"), - Integer::New(AF_INET)); + Integer::New(AF_INET, node_isolate)); target->Set(String::NewSymbol("AF_INET6"), - Integer::New(AF_INET6)); + Integer::New(AF_INET6, node_isolate)); target->Set(String::NewSymbol("AF_UNSPEC"), - Integer::New(AF_UNSPEC)); + Integer::New(AF_UNSPEC, node_isolate)); oncomplete_sym = NODE_PSYMBOL("oncomplete"); } diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc index f85f12c812..0df58c727f 100644 --- a/src/fs_event_wrap.cc +++ b/src/fs_event_wrap.cc @@ -64,7 +64,7 @@ FSEventWrap::~FSEventWrap() { void FSEventWrap::Initialize(Handle<Object> target) { HandleWrap::Initialize(target); - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); t->InstanceTemplate()->SetInternalFieldCount(1); @@ -80,7 +80,7 @@ void FSEventWrap::Initialize(Handle<Object> target) { Handle<Value> FSEventWrap::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); assert(args.IsConstructCall()); new FSEventWrap(args.This()); @@ -90,7 +90,7 @@ Handle<Value> FSEventWrap::New(const Arguments& args) { Handle<Value> FSEventWrap::Start(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(FSEventWrap) @@ -111,13 +111,13 @@ Handle<Value> FSEventWrap::Start(const Arguments& args) { SetErrno(uv_last_error(uv_default_loop())); } - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename, int events, int status) { - HandleScope scope; + HandleScope scope(node_isolate); Local<String> eventStr; FSEventWrap* wrap = static_cast<FSEventWrap*>(handle->data); @@ -137,7 +137,7 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename, // unreasonable, right? Still, we should revisit this before v1.0. if (status) { SetErrno(uv_last_error(uv_default_loop())); - eventStr = String::Empty(); + eventStr = String::Empty(node_isolate); } else if (events & UV_RENAME) { eventStr = String::New("rename"); @@ -151,10 +151,10 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename, } Local<Value> argv[3] = { - Integer::New(status), + Integer::New(status, node_isolate), eventStr, filename ? static_cast<Local<Value> >(String::New(filename)) - : Local<Value>::New(v8::Null()) + : Local<Value>::New(node_isolate, v8::Null(node_isolate)) }; if (onchange_sym.IsEmpty()) { @@ -166,7 +166,7 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename, Handle<Value> FSEventWrap::Close(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); // Unwrap manually here. The UNWRAP() macro asserts that wrap != NULL. // That usually indicates an error but not here: double closes are possible @@ -177,7 +177,7 @@ Handle<Value> FSEventWrap::Close(const Arguments& args) { FSEventWrap* wrap = static_cast<FSEventWrap*>(ptr); if (wrap == NULL || wrap->initialized_ == false) { - return Undefined(); + return Undefined(node_isolate); } wrap->initialized_ = false; diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc index 99fb6bf853..49daa4e5e6 100644 --- a/src/handle_wrap.cc +++ b/src/handle_wrap.cc @@ -53,7 +53,7 @@ void HandleWrap::Initialize(Handle<Object> target) { Handle<Value> HandleWrap::Ref(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP_NO_ABORT(HandleWrap) @@ -62,12 +62,12 @@ Handle<Value> HandleWrap::Ref(const Arguments& args) { wrap->flags_ &= ~kUnref; } - return v8::Undefined(); + return v8::Undefined(node_isolate); } Handle<Value> HandleWrap::Unref(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP_NO_ABORT(HandleWrap) @@ -76,19 +76,19 @@ Handle<Value> HandleWrap::Unref(const Arguments& args) { wrap->flags_ |= kUnref; } - return v8::Undefined(); + return v8::Undefined(node_isolate); } Handle<Value> HandleWrap::Close(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); HandleWrap *wrap = static_cast<HandleWrap*>( args.Holder()->GetAlignedPointerFromInternalField(0)); // guard against uninitialized handle or double close if (wrap == NULL || wrap->handle__ == NULL) { - return Undefined(); + return Undefined(node_isolate); } assert(!wrap->object_.IsEmpty()); @@ -101,7 +101,7 @@ Handle<Value> HandleWrap::Close(const Arguments& args) { wrap->flags_ |= kCloseCallback; } - return Undefined(); + return Undefined(node_isolate); } @@ -112,7 +112,7 @@ HandleWrap::HandleWrap(Handle<Object> object, uv_handle_t* h) { h->data = this; } - HandleScope scope; + HandleScope scope(node_isolate); assert(object_.IsEmpty()); assert(object->InternalFieldCount() > 0); object_ = v8::Persistent<v8::Object>::New(node_isolate, object); diff --git a/src/node.cc b/src/node.cc index a8587deb5a..629c84c688 100644 --- a/src/node.cc +++ b/src/node.cc @@ -186,7 +186,7 @@ static void Spin(uv_idle_t* handle, int status) { uv_idle_stop(&tick_spinner); - HandleScope scope; + HandleScope scope(node_isolate); if (process_tickFromSpinner.IsEmpty()) { Local<Value> cb_v = process->Get(String::New("_tickFromSpinner")); @@ -211,7 +211,7 @@ static void Spin(uv_idle_t* handle, int status) { static Handle<Value> NeedTickCallback(const Arguments& args) { need_tick_cb = true; uv_idle_start(&tick_spinner, Spin); - return Undefined(); + return Undefined(node_isolate); } @@ -219,7 +219,7 @@ static void CheckImmediate(uv_check_t* handle, int status) { assert(handle == &check_immediate_watcher); assert(status == 0); - HandleScope scope; + HandleScope scope(node_isolate); if (immediate_callback_sym.IsEmpty()) { immediate_callback_sym = NODE_PSYMBOL("_immediateCallback"); @@ -747,7 +747,7 @@ Local<Value> ErrnoException(int errorno, Local<Object> obj = e->ToObject(); - obj->Set(errno_symbol, Integer::New(errorno)); + obj->Set(errno_symbol, Integer::New(errorno, node_isolate)); obj->Set(code_symbol, estring); if (path) obj->Set(errpath_symbol, String::New(path)); if (syscall) obj->Set(syscall_symbol, String::NewSymbol(syscall)); @@ -819,7 +819,7 @@ Local<Value> UVException(int errorno, Local<Object> obj = e->ToObject(); // TODO errno should probably go - obj->Set(errno_symbol, Integer::New(errorno)); + obj->Set(errno_symbol, Integer::New(errorno, node_isolate)); obj->Set(code_symbol, estring); if (path) obj->Set(errpath_symbol, path_str); if (syscall) obj->Set(syscall_symbol, String::NewSymbol(syscall)); @@ -880,7 +880,7 @@ Local<Value> WinapiErrnoException(int errorno, Local<Object> obj = e->ToObject(); - obj->Set(errno_symbol, Integer::New(errorno)); + obj->Set(errno_symbol, Integer::New(errorno, node_isolate)); if (path) obj->Set(errpath_symbol, String::New(path)); if (syscall) obj->Set(syscall_symbol, String::NewSymbol(syscall)); return e; @@ -890,7 +890,7 @@ Local<Value> WinapiErrnoException(int errorno, Handle<Value> FromConstructorTemplate(Persistent<FunctionTemplate> t, const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> argv[32]; unsigned argc = args.Length(); if (argc > ARRAY_SIZE(argv)) argc = ARRAY_SIZE(argv); @@ -933,7 +933,7 @@ MakeDomainCallback(const Handle<Object> object, assert(!domain.IsEmpty()); if (domain->Get(disposed_symbol)->IsTrue()) { // domain has been disposed of. - return Undefined(); + return Undefined(node_isolate); } enter = Local<Function>::Cast(domain->Get(enter_symbol)); assert(!enter.IsEmpty()); @@ -941,14 +941,14 @@ MakeDomainCallback(const Handle<Object> object, if (try_catch.HasCaught()) { FatalException(try_catch); - return Undefined(); + return Undefined(node_isolate); } Local<Value> ret = callback->Call(object, argc, argv); if (try_catch.HasCaught()) { FatalException(try_catch); - return Undefined(); + return Undefined(node_isolate); } exit = Local<Function>::Cast(domain->Get(exit_symbol)); @@ -957,7 +957,7 @@ MakeDomainCallback(const Handle<Object> object, if (try_catch.HasCaught()) { FatalException(try_catch); - return Undefined(); + return Undefined(node_isolate); } if (tick_infobox.length == 0) { @@ -971,7 +971,7 @@ MakeDomainCallback(const Handle<Object> object, if (try_catch.HasCaught()) { FatalException(try_catch); - return Undefined(); + return Undefined(node_isolate); } return ret; @@ -983,7 +983,7 @@ MakeCallback(const Handle<Object> object, const Handle<String> symbol, int argc, Handle<Value> argv[]) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Function> callback = object->Get(symbol).As<Function>(); Local<Value> domain = object->Get(domain_symbol); @@ -1011,7 +1011,7 @@ MakeCallback(const Handle<Object> object, if (try_catch.HasCaught()) { FatalException(try_catch); - return Undefined(); + return Undefined(node_isolate); } if (tick_infobox.length == 0) { @@ -1025,7 +1025,7 @@ MakeCallback(const Handle<Object> object, if (try_catch.HasCaught()) { FatalException(try_catch); - return Undefined(); + return Undefined(node_isolate); } return scope.Close(ret); @@ -1037,7 +1037,7 @@ MakeCallback(const Handle<Object> object, const char* method, int argc, Handle<Value> argv[]) { - HandleScope scope; + HandleScope scope(node_isolate); Handle<Value> ret = MakeCallback(object, String::NewSymbol(method), argc, argv); @@ -1047,7 +1047,7 @@ MakeCallback(const Handle<Object> object, void SetErrno(uv_err_t err) { - HandleScope scope; + HandleScope scope(node_isolate); static Persistent<String> errno_symbol; if (errno_symbol.IsEmpty()) { @@ -1065,7 +1065,7 @@ void SetErrno(uv_err_t err) { enum encoding ParseEncoding(Handle<Value> encoding_v, enum encoding _default) { - HandleScope scope; + HandleScope scope(node_isolate); if (!encoding_v->IsString()) return _default; @@ -1111,14 +1111,14 @@ enum encoding ParseEncoding(Handle<Value> encoding_v, enum encoding _default) { } Local<Value> Encode(const void *buf, size_t len, enum encoding encoding) { - HandleScope scope; + HandleScope scope(node_isolate); if (encoding == BUFFER) { return scope.Close( Buffer::New(static_cast<const char*>(buf), len)->handle_); } - if (!len) return scope.Close(String::Empty()); + if (!len) return scope.Close(String::Empty(node_isolate)); if (encoding == BINARY) { const unsigned char *cbuf = static_cast<const unsigned char*>(buf); @@ -1139,7 +1139,7 @@ Local<Value> Encode(const void *buf, size_t len, enum encoding encoding) { // Returns -1 if the handle was not valid for decoding ssize_t DecodeBytes(v8::Handle<v8::Value> val, enum encoding encoding) { - HandleScope scope; + HandleScope scope(node_isolate); if (val->IsArray()) { fprintf(stderr, "'raw' encoding (array of integers) has been removed. " @@ -1170,7 +1170,7 @@ ssize_t DecodeWrite(char *buf, size_t buflen, v8::Handle<v8::Value> val, enum encoding encoding) { - HandleScope scope; + HandleScope scope(node_isolate); // XXX // A lot of improvement can be made here. See: @@ -1243,7 +1243,7 @@ void DisplayExceptionLine (TryCatch &try_catch) { if (displayed_error) return; displayed_error = true; - HandleScope scope; + HandleScope scope(node_isolate); Handle<Message> message = try_catch.Message(); @@ -1301,7 +1301,7 @@ void DisplayExceptionLine (TryCatch &try_catch) { static void ReportException(TryCatch &try_catch, bool show_line) { - HandleScope scope; + HandleScope scope(node_isolate); if (show_line) DisplayExceptionLine(try_catch); @@ -1334,7 +1334,7 @@ static void ReportException(TryCatch &try_catch, bool show_line) { // Executes a str within the current v8 context. Local<Value> ExecuteString(Handle<String> source, Handle<Value> filename) { - HandleScope scope; + HandleScope scope(node_isolate); TryCatch try_catch; Local<v8::Script> script = v8::Script::Compile(source, filename); @@ -1354,7 +1354,7 @@ Local<Value> ExecuteString(Handle<String> source, Handle<Value> filename) { static Handle<Value> GetActiveRequests(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Array> ary = Array::New(); ngx_queue_t* q = NULL; @@ -1373,7 +1373,7 @@ static Handle<Value> GetActiveRequests(const Arguments& args) { // Non-static, friend of HandleWrap. Could have been a HandleWrap method but // implemented here for consistency with GetActiveRequests(). Handle<Value> GetActiveHandles(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Array> ary = Array::New(); ngx_queue_t* q = NULL; @@ -1395,12 +1395,12 @@ Handle<Value> GetActiveHandles(const Arguments& args) { static Handle<Value> Abort(const Arguments& args) { abort(); - return Undefined(); + return Undefined(node_isolate); } static Handle<Value> Chdir(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() != 1 || !args[0]->IsString()) { return ThrowException(Exception::Error(String::New("Bad argument."))); @@ -1414,12 +1414,12 @@ static Handle<Value> Chdir(const Arguments& args) { return ThrowException(UVException(r.code, "uv_chdir")); } - return Undefined(); + return Undefined(node_isolate); } static Handle<Value> Cwd(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); #ifdef _WIN32 /* MAX_PATH is in characters, not bytes. Make sure we have enough headroom. */ char buf[MAX_PATH * 4 + 1]; @@ -1440,7 +1440,7 @@ static Handle<Value> Cwd(const Arguments& args) { static Handle<Value> Umask(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); unsigned int old; if (args.Length() < 1 || args[0]->IsUndefined()) { @@ -1473,7 +1473,7 @@ static Handle<Value> Umask(const Arguments& args) { old = umask(static_cast<mode_t>(oct)); } - return scope.Close(Uint32::New(old)); + return scope.Close(Uint32::New(old, node_isolate)); } @@ -1582,21 +1582,21 @@ static gid_t gid_by_name(Handle<Value> value) { static Handle<Value> GetUid(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int uid = getuid(); - return scope.Close(Integer::New(uid)); + return scope.Close(Integer::New(uid, node_isolate)); } static Handle<Value> GetGid(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int gid = getgid(); - return scope.Close(Integer::New(gid)); + return scope.Close(Integer::New(gid, node_isolate)); } static Handle<Value> SetGid(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (!args[0]->IsUint32() && !args[0]->IsString()) { return ThrowTypeError("setgid argument must be a number or a string"); @@ -1612,12 +1612,12 @@ static Handle<Value> SetGid(const Arguments& args) { return ThrowException(ErrnoException(errno, "setgid")); } - return Undefined(); + return Undefined(node_isolate); } static Handle<Value> SetUid(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (!args[0]->IsUint32() && !args[0]->IsString()) { return ThrowTypeError("setuid argument must be a number or a string"); @@ -1633,12 +1633,12 @@ static Handle<Value> SetUid(const Arguments& args) { return ThrowException(ErrnoException(errno, "setuid")); } - return Undefined(); + return Undefined(node_isolate); } static Handle<Value> GetGroups(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int ngroups = getgroups(0, NULL); @@ -1660,14 +1660,14 @@ static Handle<Value> GetGroups(const Arguments& args) { gid_t egid = getegid(); for (int i = 0; i < ngroups; i++) { - groups_list->Set(i, Integer::New(groups[i])); + groups_list->Set(i, Integer::New(groups[i], node_isolate)); if (groups[i] == egid) seen_egid = true; } delete[] groups; if (seen_egid == false) { - groups_list->Set(ngroups, Integer::New(egid)); + groups_list->Set(ngroups, Integer::New(egid, node_isolate)); } return scope.Close(groups_list); @@ -1675,7 +1675,7 @@ static Handle<Value> GetGroups(const Arguments& args) { static Handle<Value> SetGroups(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (!args[0]->IsArray()) { return ThrowTypeError("argument 1 must be an array"); @@ -1703,12 +1703,12 @@ static Handle<Value> SetGroups(const Arguments& args) { return ThrowException(ErrnoException(errno, "setgroups")); } - return Undefined(); + return Undefined(node_isolate); } static Handle<Value> InitGroups(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (!args[0]->IsUint32() && !args[0]->IsString()) { return ThrowTypeError("argument 1 must be a number or a string"); @@ -1752,27 +1752,27 @@ static Handle<Value> InitGroups(const Arguments& args) { return ThrowException(ErrnoException(errno, "initgroups")); } - return Undefined(); + return Undefined(node_isolate); } #endif // __POSIX__ v8::Handle<v8::Value> Exit(const v8::Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); exit(args[0]->IntegerValue()); - return Undefined(); + return Undefined(node_isolate); } static Handle<Value> Uptime(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); double uptime; uv_err_t err = uv_uptime(&uptime); if (err.code != UV_OK) { - return Undefined(); + return Undefined(node_isolate); } return scope.Close(Number::New(uptime - prog_start_time)); @@ -1780,7 +1780,7 @@ static Handle<Value> Uptime(const Arguments& args) { v8::Handle<v8::Value> MemoryUsage(const v8::Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); size_t rss; @@ -1804,16 +1804,18 @@ v8::Handle<v8::Value> MemoryUsage(const v8::Arguments& args) { HeapStatistics v8_heap_stats; node_isolate->GetHeapStatistics(&v8_heap_stats); info->Set(heap_total_symbol, - Integer::NewFromUnsigned(v8_heap_stats.total_heap_size())); + Integer::NewFromUnsigned(v8_heap_stats.total_heap_size(), + node_isolate)); info->Set(heap_used_symbol, - Integer::NewFromUnsigned(v8_heap_stats.used_heap_size())); + Integer::NewFromUnsigned(v8_heap_stats.used_heap_size(), + node_isolate)); return scope.Close(info); } Handle<Value> Kill(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() != 2) { return ThrowException(Exception::Error(String::New("Bad argument."))); @@ -1825,10 +1827,10 @@ Handle<Value> Kill(const Arguments& args) { if (err.code != UV_OK) { SetErrno(err); - return scope.Close(Integer::New(-1)); + return scope.Close(Integer::New(-1, node_isolate)); } - return Undefined(); + return Undefined(node_isolate); } // used in Hrtime() below @@ -1840,7 +1842,7 @@ Handle<Value> Kill(const Arguments& args) { // and nanoseconds, to avoid any integer overflow possibility. // Pass in an Array from a previous hrtime() call to instead get a time diff. Handle<Value> Hrtime(const v8::Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); uint64_t t = uv_hrtime(); @@ -1858,8 +1860,8 @@ Handle<Value> Hrtime(const v8::Arguments& args) { } Local<Array> tuple = Array::New(2); - tuple->Set(0, Integer::NewFromUnsigned(t / NANOS_PER_SEC)); - tuple->Set(1, Integer::NewFromUnsigned(t % NANOS_PER_SEC)); + tuple->Set(0, Integer::NewFromUnsigned(t / NANOS_PER_SEC, node_isolate)); + tuple->Set(1, Integer::NewFromUnsigned(t % NANOS_PER_SEC, node_isolate)); return scope.Close(tuple); } @@ -1870,7 +1872,7 @@ typedef void (UV_DYNAMIC* extInit)(Handle<Object> exports); // DLOpen is process.dlopen(module, filename). // Used to load 'module.node' dynamically shared objects. Handle<Value> DLOpen(const v8::Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); char symbol[1024], *base, *pos; uv_lib_t lib; int r; @@ -1959,7 +1961,7 @@ Handle<Value> DLOpen(const v8::Arguments& args) { // Tell coverity that 'handle' should not be freed when we return. // coverity[leaked_storage] - return Undefined(); + return Undefined(node_isolate); } @@ -1973,7 +1975,7 @@ static void OnFatalError(const char* location, const char* message) { } void FatalException(TryCatch &try_catch) { - HandleScope scope; + HandleScope scope(node_isolate); if (fatal_exception_symbol.IsEmpty()) fatal_exception_symbol = NODE_PSYMBOL("_fatalException"); @@ -2014,7 +2016,7 @@ Persistent<Object> binding_cache; Persistent<Array> module_load_list; static Handle<Value> Binding(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Local<String> module = args[0]->ToString(); String::Utf8Value module_v(module); @@ -2041,7 +2043,7 @@ static Handle<Value> Binding(const Arguments& args) { exports = Object::New(); // Internal bindings don't have a "module" object, // only exports. - modp->register_func(exports, Undefined()); + modp->register_func(exports, Undefined(node_isolate)); binding_cache->Set(module, exports); } else if (!strcmp(*module_v, "constants")) { @@ -2065,7 +2067,7 @@ static Handle<Value> Binding(const Arguments& args) { static Handle<Value> ProcessTitleGetter(Local<String> property, const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); char buffer[512]; uv_get_process_title(buffer, sizeof(buffer)); return scope.Close(String::New(buffer)); @@ -2075,7 +2077,7 @@ static Handle<Value> ProcessTitleGetter(Local<String> property, static void ProcessTitleSetter(Local<String> property, Local<Value> value, const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); String::Utf8Value title(value); // TODO: protect with a lock uv_set_process_title(*title); @@ -2084,7 +2086,7 @@ static void ProcessTitleSetter(Local<String> property, static Handle<Value> EnvGetter(Local<String> property, const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); #ifdef __POSIX__ String::Utf8Value key(property); const char* val = getenv(*key); @@ -2113,7 +2115,7 @@ static Handle<Value> EnvGetter(Local<String> property, static Handle<Value> EnvSetter(Local<String> property, Local<Value> value, const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); #ifdef __POSIX__ String::Utf8Value key(property); String::Utf8Value val(value); @@ -2134,11 +2136,11 @@ static Handle<Value> EnvSetter(Local<String> property, static Handle<Integer> EnvQuery(Local<String> property, const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); #ifdef __POSIX__ String::Utf8Value key(property); if (getenv(*key)) { - return scope.Close(Integer::New(0)); + return scope.Close(Integer::New(0, node_isolate)); } #else // _WIN32 String::Value key(property); @@ -2149,9 +2151,10 @@ static Handle<Integer> EnvQuery(Local<String> property, // Environment variables that start with '=' are hidden and read-only. return scope.Close(Integer::New(v8::ReadOnly || v8::DontDelete || - v8::DontEnum)); + v8::DontEnum, + node_isolate)); } else { - return scope.Close(Integer::New(0)); + return scope.Close(Integer::New(0, node_isolate)); } } #endif @@ -2162,12 +2165,12 @@ static Handle<Integer> EnvQuery(Local<String> property, static Handle<Boolean> EnvDeleter(Local<String> property, const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); #ifdef __POSIX__ String::Utf8Value key(property); - if (!getenv(*key)) return False(); + if (!getenv(*key)) return False(node_isolate); unsetenv(*key); // can't check return value, it's void on some platforms - return True(); + return True(node_isolate); #else String::Value key(property); WCHAR* key_ptr = reinterpret_cast<WCHAR*>(*key); @@ -2178,13 +2181,13 @@ static Handle<Boolean> EnvDeleter(Local<String> property, GetLastError() != ERROR_SUCCESS; return scope.Close(Boolean::New(rv)); } - return True(); + return True(node_isolate); #endif } static Handle<Array> EnvEnumerator(const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); #ifdef __POSIX__ int size = 0; while (environ[size]) size++; @@ -2228,19 +2231,19 @@ static Handle<Array> EnvEnumerator(const AccessorInfo& info) { static Handle<Object> GetFeatures() { - HandleScope scope; + HandleScope scope(node_isolate); Local<Object> obj = Object::New(); obj->Set(String::NewSymbol("debug"), #if defined(DEBUG) && DEBUG - True() + True(node_isolate) #else - False() + False(node_isolate) #endif ); - obj->Set(String::NewSymbol("uv"), True()); - obj->Set(String::NewSymbol("ipv6"), True()); // TODO ping libuv + obj->Set(String::NewSymbol("uv"), True(node_isolate)); + obj->Set(String::NewSymbol("ipv6"), True(node_isolate)); // TODO ping libuv obj->Set(String::NewSymbol("tls_npn"), Boolean::New(use_npn)); obj->Set(String::NewSymbol("tls_sni"), Boolean::New(use_sni)); obj->Set(String::NewSymbol("tls"), @@ -2252,15 +2255,15 @@ static Handle<Object> GetFeatures() { static Handle<Value> DebugPortGetter(Local<String> property, const AccessorInfo& info) { - HandleScope scope; - return scope.Close(Integer::NewFromUnsigned(debug_port)); + HandleScope scope(node_isolate); + return scope.Close(Integer::NewFromUnsigned(debug_port, node_isolate)); } static void DebugPortSetter(Local<String> property, Local<Value> value, const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); debug_port = value->NumberValue(); } @@ -2279,7 +2282,7 @@ Handle<Value> NeedImmediateCallbackGetter(Local<String> property, static void NeedImmediateCallbackSetter(Local<String> property, Local<Value> value, const AccessorInfo& info) { - HandleScope scope; + HandleScope scope(node_isolate); bool bool_value = value->BooleanValue(); @@ -2299,7 +2302,7 @@ static void NeedImmediateCallbackSetter(Local<String> property, Handle<Object> SetupProcessObject(int argc, char *argv[]) { - HandleScope scope; + HandleScope scope(node_isolate); int i, j; @@ -2362,10 +2365,10 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) { // process.argv Local<Array> arguments = Array::New(argc - option_end_index + 1); - arguments->Set(Integer::New(0), String::New(argv[0])); + arguments->Set(Integer::New(0, node_isolate), String::New(argv[0])); for (j = 1, i = option_end_index; i < argc; j++, i++) { Local<String> arg = String::New(argv[i]); - arguments->Set(Integer::New(j), arg); + arguments->Set(Integer::New(j, node_isolate), arg); } // assign it process->Set(String::NewSymbol("argv"), arguments); @@ -2373,7 +2376,7 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) { // process.execArgv Local<Array> execArgv = Array::New(option_end_index - 1); for (j = 1, i = 0; j < option_end_index; j++, i++) { - execArgv->Set(Integer::New(i), String::New(argv[j])); + execArgv->Set(Integer::New(i, node_isolate), String::New(argv[j])); } // assign it process->Set(String::NewSymbol("execArgv"), execArgv); @@ -2390,7 +2393,7 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) { Local<Object> env = envTemplate->NewInstance(); process->Set(String::NewSymbol("env"), env); - process->Set(String::NewSymbol("pid"), Integer::New(getpid())); + process->Set(String::NewSymbol("pid"), Integer::New(getpid(), node_isolate)); process->Set(String::NewSymbol("features"), GetFeatures()); process->SetAccessor(String::New("_needImmediateCallback"), NeedImmediateCallbackGetter, @@ -2403,17 +2406,17 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) { // -p, --print if (print_eval) { - process->Set(String::NewSymbol("_print_eval"), True()); + process->Set(String::NewSymbol("_print_eval"), True(node_isolate)); } // -i, --interactive if (force_repl) { - process->Set(String::NewSymbol("_forceRepl"), True()); + process->Set(String::NewSymbol("_forceRepl"), True(node_isolate)); } // --no-deprecation if (no_deprecation) { - process->Set(String::NewSymbol("noDeprecation"), True()); + process->Set(String::NewSymbol("noDeprecation"), True(node_isolate)); } // --throw-deprecation @@ -2423,7 +2426,7 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) { // --trace-deprecation if (trace_deprecation) { - process->Set(String::NewSymbol("traceDeprecation"), True()); + process->Set(String::NewSymbol("traceDeprecation"), True(node_isolate)); } size_t size = 2*PATH_MAX; @@ -2536,7 +2539,7 @@ void Load(Handle<Object> process_l) { // Add a reference to the global object Local<Object> global = v8::Context::GetCurrent()->Global(); - Local<Value> args[1] = { Local<Value>::New(process_l) }; + Local<Value> args[1] = { Local<Value>::New(node_isolate, process_l) }; #if defined HAVE_DTRACE || defined HAVE_ETW || defined HAVE_SYSTEMTAP InitDTrace(global); @@ -2751,7 +2754,7 @@ static void RegisterSignalHandler(int signal, void (*handler)(int)) { Handle<Value> DebugProcess(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() != 1) { return ThrowException(Exception::Error( @@ -2767,7 +2770,7 @@ Handle<Value> DebugProcess(const Arguments& args) { return ThrowException(ErrnoException(errno, "kill")); } - return Undefined(); + return Undefined(node_isolate); } #endif // __POSIX__ @@ -2783,7 +2786,7 @@ DWORD WINAPI EnableDebugThreadProc(void* arg) { } } - v8::Debug::DebugBreak(); + v8::Debug::DebugBreak(node_isolate); return 0; } @@ -2839,8 +2842,8 @@ static int RegisterDebugSignalHandler() { static Handle<Value> DebugProcess(const Arguments& args) { - HandleScope scope; - Handle<Value> rv = Undefined(); + HandleScope scope(node_isolate); + Handle<Value> rv = Undefined(node_isolate); DWORD pid; HANDLE process = NULL; HANDLE thread = NULL; @@ -2924,14 +2927,14 @@ static Handle<Value> DebugProcess(const Arguments& args) { CloseHandle(mapping); } - return Undefined(); + return Undefined(node_isolate); } #endif // _WIN32 static Handle<Value> DebugPause(const Arguments& args) { v8::Debug::DebugBreak(node_isolate); - return Undefined(); + return Undefined(node_isolate); } @@ -2941,7 +2944,7 @@ static Handle<Value> DebugEnd(const Arguments& args) { debugger_running = false; } - return Undefined(); + return Undefined(node_isolate); } @@ -3055,11 +3058,11 @@ void AtExit(void (*cb)(void* arg), void* arg) { void EmitExit(v8::Handle<v8::Object> process_l) { // process.emit('exit') - process_l->Set(String::NewSymbol("_exiting"), True()); + process_l->Set(String::NewSymbol("_exiting"), True(node_isolate)); Local<Value> emit_v = process_l->Get(String::New("emit")); assert(emit_v->IsFunction()); Local<Function> emit = Local<Function>::Cast(emit_v); - Local<Value> args[] = { String::New("exit"), Integer::New(0) }; + Local<Value> args[] = { String::New("exit"), Integer::New(0, node_isolate) }; TryCatch try_catch; emit->Call(process_l, 2, args); if (try_catch.HasCaught()) { diff --git a/src/node_buffer.cc b/src/node_buffer.cc index 55cf91d1cb..e629ecd44d 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -92,7 +92,7 @@ static inline size_t base64_decoded_size(const char *src, size_t size) { static size_t ByteLength (Handle<String> string, enum encoding enc) { - HandleScope scope; + HandleScope scope(node_isolate); if (enc == UTF8) { return string->Utf8Length(); @@ -110,7 +110,7 @@ static size_t ByteLength (Handle<String> string, enum encoding enc) { Handle<Object> Buffer::New(Handle<String> string) { - HandleScope scope; + HandleScope scope(node_isolate); // get Buffer from global scope. Local<Object> global = v8::Context::GetCurrent()->Global(); @@ -118,7 +118,7 @@ Handle<Object> Buffer::New(Handle<String> string) { assert(bv->IsFunction()); Local<Function> b = Local<Function>::Cast(bv); - Local<Value> argv[1] = { Local<Value>::New(string) }; + Local<Value> argv[1] = { Local<Value>::New(node_isolate, string) }; Local<Object> instance = b->NewInstance(1, argv); return scope.Close(instance); @@ -126,9 +126,9 @@ Handle<Object> Buffer::New(Handle<String> string) { Buffer* Buffer::New(size_t length) { - HandleScope scope; + HandleScope scope(node_isolate); - Local<Value> arg = Integer::NewFromUnsigned(length); + Local<Value> arg = Integer::NewFromUnsigned(length, node_isolate); Local<Object> b = constructor_template->GetFunction()->NewInstance(1, &arg); if (b.IsEmpty()) return NULL; @@ -137,9 +137,9 @@ Buffer* Buffer::New(size_t length) { Buffer* Buffer::New(const char* data, size_t length) { - HandleScope scope; + HandleScope scope(node_isolate); - Local<Value> arg = Integer::NewFromUnsigned(0); + Local<Value> arg = Integer::NewFromUnsigned(0, node_isolate); Local<Object> obj = constructor_template->GetFunction()->NewInstance(1, &arg); Buffer *buffer = ObjectWrap::Unwrap<Buffer>(obj); @@ -151,9 +151,9 @@ Buffer* Buffer::New(const char* data, size_t length) { Buffer* Buffer::New(char *data, size_t length, free_callback callback, void *hint) { - HandleScope scope; + HandleScope scope(node_isolate); - Local<Value> arg = Integer::NewFromUnsigned(0); + Local<Value> arg = Integer::NewFromUnsigned(0, node_isolate); Local<Object> obj = constructor_template->GetFunction()->NewInstance(1, &arg); Buffer *buffer = ObjectWrap::Unwrap<Buffer>(obj); @@ -168,7 +168,7 @@ Handle<Value> Buffer::New(const Arguments &args) { return FromConstructorTemplate(constructor_template, args); } - HandleScope scope; + HandleScope scope(node_isolate); if (!args[0]->IsUint32()) return ThrowTypeError("Bad argument"); @@ -202,7 +202,7 @@ Buffer::~Buffer() { // const_cast in Buffer::New requires this void Buffer::Replace(char *data, size_t length, free_callback callback, void *hint) { - HandleScope scope; + HandleScope scope(node_isolate); if (callback_) { callback_(data_, callback_hint_); @@ -231,12 +231,12 @@ void Buffer::Replace(char *data, size_t length, handle_->SetIndexedPropertiesToExternalArrayData(data_, kExternalUnsignedByteArray, length_); - handle_->Set(length_symbol, Integer::NewFromUnsigned(length_)); + handle_->Set(length_symbol, Integer::NewFromUnsigned(length_, node_isolate)); } Handle<Value> Buffer::BinarySlice(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *parent = ObjectWrap::Unwrap<Buffer>(args.This()); SLICE_ARGS(args[0], args[1]) @@ -352,7 +352,7 @@ static void force_ascii(const char* src, char* dst, size_t len) { Handle<Value> Buffer::AsciiSlice(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *parent = ObjectWrap::Unwrap<Buffer>(args.This()); SLICE_ARGS(args[0], args[1]) @@ -372,7 +372,7 @@ Handle<Value> Buffer::AsciiSlice(const Arguments &args) { Handle<Value> Buffer::Utf8Slice(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *parent = ObjectWrap::Unwrap<Buffer>(args.This()); SLICE_ARGS(args[0], args[1]) char *data = parent->data_ + start; @@ -382,7 +382,7 @@ Handle<Value> Buffer::Utf8Slice(const Arguments &args) { Handle<Value> Buffer::Ucs2Slice(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *parent = ObjectWrap::Unwrap<Buffer>(args.This()); SLICE_ARGS(args[0], args[1]) uint16_t *data = (uint16_t*)(parent->data_ + start); @@ -392,12 +392,12 @@ Handle<Value> Buffer::Ucs2Slice(const Arguments &args) { Handle<Value> Buffer::HexSlice(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer* parent = ObjectWrap::Unwrap<Buffer>(args.This()); SLICE_ARGS(args[0], args[1]) char* src = parent->data_ + start; uint32_t dstlen = (end - start) * 2; - if (dstlen == 0) return scope.Close(String::Empty()); + if (dstlen == 0) return scope.Close(String::Empty(node_isolate)); char* dst = new char[dstlen]; for (uint32_t i = 0, k = 0; k < dstlen; i += 1, k += 2) { static const char hex[] = "0123456789abcdef"; @@ -434,7 +434,7 @@ static const int unbase64_table[] = Handle<Value> Buffer::Base64Slice(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *parent = ObjectWrap::Unwrap<Buffer>(args.This()); SLICE_ARGS(args[0], args[1]) @@ -503,7 +503,7 @@ Handle<Value> Buffer::Base64Slice(const Arguments &args) { // buffer.fill(value, start, end); Handle<Value> Buffer::Fill(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); if (!args[0]->IsInt32()) { return ThrowException(Exception::Error(String::New( @@ -518,13 +518,13 @@ Handle<Value> Buffer::Fill(const Arguments &args) { value, end - start); - return Undefined(); + return Undefined(node_isolate); } // var bytesCopied = buffer.copy(target, targetStart, sourceStart, sourceEnd); Handle<Value> Buffer::Copy(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *source = ObjectWrap::Unwrap<Buffer>(args.This()); @@ -546,7 +546,7 @@ Handle<Value> Buffer::Copy(const Arguments &args) { // Copy 0 bytes; we're done if (source_end == source_start) { - return scope.Close(Integer::New(0)); + return scope.Close(Integer::New(0, node_isolate)); } if (target_start >= target_length) { @@ -570,13 +570,13 @@ Handle<Value> Buffer::Copy(const Arguments &args) { (const void*)(source->data_ + source_start), to_copy); - return scope.Close(Integer::New(to_copy)); + return scope.Close(Integer::New(to_copy, node_isolate)); } // var charsWritten = buffer.utf8Write(string, offset, [maxLength]); Handle<Value> Buffer::Utf8Write(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *buffer = ObjectWrap::Unwrap<Buffer>(args.This()); if (!args[0]->IsString()) { @@ -592,8 +592,8 @@ Handle<Value> Buffer::Utf8Write(const Arguments &args) { if (length == 0) { constructor_template->GetFunction()->Set(chars_written_sym, - Integer::New(0)); - return scope.Close(Integer::New(0)); + Integer::New(0, node_isolate)); + return scope.Close(Integer::New(0, node_isolate)); } if (length > 0 && offset >= buffer->length_) { @@ -615,15 +615,16 @@ Handle<Value> Buffer::Utf8Write(const Arguments &args) { String::NO_NULL_TERMINATION)); constructor_template->GetFunction()->Set(chars_written_sym, - Integer::New(char_written)); + Integer::New(char_written, + node_isolate)); - return scope.Close(Integer::New(written)); + return scope.Close(Integer::New(written, node_isolate)); } // var charsWritten = buffer.ucs2Write(string, offset, [maxLength]); Handle<Value> Buffer::Ucs2Write(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *buffer = ObjectWrap::Unwrap<Buffer>(args.This()); if (!args[0]->IsString()) { @@ -652,9 +653,9 @@ Handle<Value> Buffer::Ucs2Write(const Arguments &args) { String::NO_NULL_TERMINATION)); constructor_template->GetFunction()->Set(chars_written_sym, - Integer::New(written)); + Integer::New(written, node_isolate)); - return scope.Close(Integer::New(written * 2)); + return scope.Close(Integer::New(written * 2, node_isolate)); } @@ -667,7 +668,7 @@ inline unsigned hex2bin(char c) { Handle<Value> Buffer::HexWrite(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer* parent = ObjectWrap::Unwrap<Buffer>(args.This()); if (args[0]->IsString() == false) { @@ -685,7 +686,7 @@ Handle<Value> Buffer::HexWrite(const Arguments& args) { uint32_t end = start + size; if (start >= parent->length_) { - Local<Integer> val = Integer::New(0); + Local<Integer> val = Integer::New(0, node_isolate); constructor_template->GetFunction()->Set(chars_written_sym, val); return scope.Close(val); } @@ -696,7 +697,7 @@ Handle<Value> Buffer::HexWrite(const Arguments& args) { } if (size == 0) { - Local<Integer> val = Integer::New(0); + Local<Integer> val = Integer::New(0, node_isolate); constructor_template->GetFunction()->Set(chars_written_sym, val); return scope.Close(val); } @@ -718,15 +719,15 @@ Handle<Value> Buffer::HexWrite(const Arguments& args) { } constructor_template->GetFunction()->Set(chars_written_sym, - Integer::New(max * 2)); + Integer::New(max * 2, node_isolate)); - return scope.Close(Integer::New(max)); + return scope.Close(Integer::New(max, node_isolate)); } // var charsWritten = buffer.asciiWrite(string, offset); Handle<Value> Buffer::AsciiWrite(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *buffer = ObjectWrap::Unwrap<Buffer>(args.This()); @@ -755,15 +756,15 @@ Handle<Value> Buffer::AsciiWrite(const Arguments &args) { String::NO_NULL_TERMINATION)); constructor_template->GetFunction()->Set(chars_written_sym, - Integer::New(written)); + Integer::New(written, node_isolate)); - return scope.Close(Integer::New(written)); + return scope.Close(Integer::New(written, node_isolate)); } // var bytesWritten = buffer.base64Write(string, offset, [maxLength]); Handle<Value> Buffer::Base64Write(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *buffer = ObjectWrap::Unwrap<Buffer>(args.This()); @@ -818,14 +819,15 @@ Handle<Value> Buffer::Base64Write(const Arguments &args) { } constructor_template->GetFunction()->Set(chars_written_sym, - Integer::New(dst - start)); + Integer::New(dst - start, + node_isolate)); - return scope.Close(Integer::New(dst - start)); + return scope.Close(Integer::New(dst - start, node_isolate)); } Handle<Value> Buffer::BinaryWrite(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); Buffer *buffer = ObjectWrap::Unwrap<Buffer>(args.This()); @@ -850,9 +852,9 @@ Handle<Value> Buffer::BinaryWrite(const Arguments &args) { int written = DecodeWrite(p, max_length, s, BINARY); constructor_template->GetFunction()->Set(chars_written_sym, - Integer::New(written)); + Integer::New(written, node_isolate)); - return scope.Close(Integer::New(written)); + return scope.Close(Integer::New(written, node_isolate)); } @@ -949,7 +951,7 @@ Handle<Value> WriteFloatGeneric(const Arguments& args) { if (ENDIANNESS != is_big_endian()) swizzle(ptr, sizeof(T)); - return Undefined(); + return Undefined(node_isolate); } @@ -975,7 +977,7 @@ Handle<Value> Buffer::WriteDoubleBE(const Arguments& args) { // var nbytes = Buffer.byteLength("string", "utf8") Handle<Value> Buffer::ByteLength(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); if (!args[0]->IsString()) { return ThrowTypeError("Argument must be a string"); @@ -984,12 +986,12 @@ Handle<Value> Buffer::ByteLength(const Arguments &args) { Local<String> s = args[0]->ToString(); enum encoding e = ParseEncoding(args[1], UTF8); - return scope.Close(Integer::New(node::ByteLength(s, e))); + return scope.Close(Integer::New(node::ByteLength(s, e), node_isolate)); } Handle<Value> Buffer::MakeFastBuffer(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); if (!Buffer::HasInstance(args[0])) { return ThrowTypeError("First argument must be a Buffer"); @@ -1017,7 +1019,7 @@ Handle<Value> Buffer::MakeFastBuffer(const Arguments &args) { kExternalUnsignedByteArray, length); - return Undefined(); + return Undefined(node_isolate); } @@ -1042,7 +1044,7 @@ Handle<Value> SetFastBufferConstructor(const Arguments& args) { assert(args[0]->IsFunction()); fast_buffer_constructor = Persistent<Function>::New(node_isolate, args[0].As<Function>()); - return Undefined(); + return Undefined(node_isolate); } @@ -1102,7 +1104,7 @@ RetainedObjectInfo* WrapperInfo(uint16_t class_id, Handle<Value> wrapper) { void Buffer::Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); // sanity checks assert(unbase64('/') == 63); diff --git a/src/node_counters.cc b/src/node_counters.cc index c5726842a6..289be60186 100644 --- a/src/node_counters.cc +++ b/src/node_counters.cc @@ -44,37 +44,37 @@ static uint64_t counter_gc_end_time; Handle<Value> COUNTER_NET_SERVER_CONNECTION(const Arguments& args) { NODE_COUNT_SERVER_CONN_OPEN(); - return Undefined(); + return Undefined(node_isolate); } Handle<Value> COUNTER_NET_SERVER_CONNECTION_CLOSE(const Arguments& args) { NODE_COUNT_SERVER_CONN_CLOSE(); - return Undefined(); + return Undefined(node_isolate); } Handle<Value> COUNTER_HTTP_SERVER_REQUEST(const Arguments& args) { NODE_COUNT_HTTP_SERVER_REQUEST(); - return Undefined(); + return Undefined(node_isolate); } Handle<Value> COUNTER_HTTP_SERVER_RESPONSE(const Arguments& args) { NODE_COUNT_HTTP_SERVER_RESPONSE(); - return Undefined(); + return Undefined(node_isolate); } Handle<Value> COUNTER_HTTP_CLIENT_REQUEST(const Arguments& args) { NODE_COUNT_HTTP_CLIENT_REQUEST(); - return Undefined(); + return Undefined(node_isolate); } Handle<Value> COUNTER_HTTP_CLIENT_RESPONSE(const Arguments& args) { NODE_COUNT_HTTP_CLIENT_RESPONSE(); - return Undefined(); + return Undefined(node_isolate); } @@ -106,7 +106,7 @@ static void counter_gc_done(GCType type, GCCallbackFlags flags) { #define NODE_PROBE(name) #name, name void InitPerfCounters(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); static struct { const char* name; diff --git a/src/node_crypto.cc b/src/node_crypto.cc index ff5848fac7..c9b3a5164f 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -120,7 +120,7 @@ static void crypto_lock_cb(int mode, int n, const char* file, int line) { Handle<Value> ThrowCryptoErrorHelper(unsigned long err, bool is_type_error) { - HandleScope scope; + HandleScope scope(node_isolate); char errmsg[128]; ERR_error_string_n(err, errmsg, sizeof(errmsg)); return is_type_error ? ThrowTypeError(errmsg) : ThrowError(errmsg); @@ -138,7 +138,7 @@ Handle<Value> ThrowCryptoTypeError(unsigned long err) { void SecureContext::Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(SecureContext::New); secure_context_constructor = Persistent<FunctionTemplate>::New(node_isolate, @@ -165,7 +165,7 @@ void SecureContext::Initialize(Handle<Object> target) { Handle<Value> SecureContext::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *p = new SecureContext(); p->Wrap(args.Holder()); return args.This(); @@ -173,7 +173,7 @@ Handle<Value> SecureContext::New(const Arguments& args) { Handle<Value> SecureContext::Init(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -234,7 +234,7 @@ Handle<Value> SecureContext::Init(const Arguments& args) { SSL_CTX_sess_set_new_cb(sc->ctx_, NewSessionCallback); sc->ca_store_ = NULL; - return True(); + return True(node_isolate); } @@ -242,7 +242,7 @@ SSL_SESSION* SecureContext::GetSessionCallback(SSL* s, unsigned char* key, int len, int* copy) { - HandleScope scope; + HandleScope scope(node_isolate); Connection* p = static_cast<Connection*>(SSL_get_app_data(s)); @@ -260,7 +260,7 @@ void SessionDataFree(char* data, void* hint) { int SecureContext::NewSessionCallback(SSL* s, SSL_SESSION* sess) { - HandleScope scope; + HandleScope scope(node_isolate); Connection* p = static_cast<Connection*>(SSL_get_app_data(s)); @@ -295,7 +295,7 @@ static BIO* LoadBIO (Handle<Value> v) { BIO *bio = BIO_new(BIO_s_mem()); if (!bio) return NULL; - HandleScope scope; + HandleScope scope(node_isolate); int r = -1; @@ -320,7 +320,7 @@ static BIO* LoadBIO (Handle<Value> v) { // Takes a string or buffer and loads it into an X509 // Caller responsible for X509_free-ing the returned object. static X509* LoadX509 (Handle<Value> v) { - HandleScope scope; // necessary? + HandleScope scope(node_isolate); // necessary? BIO *bio = LoadBIO(v); if (!bio) return NULL; @@ -337,7 +337,7 @@ static X509* LoadX509 (Handle<Value> v) { Handle<Value> SecureContext::SetKey(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -350,7 +350,7 @@ Handle<Value> SecureContext::SetKey(const Arguments& args) { } BIO *bio = LoadBIO(args[0]); - if (!bio) return False(); + if (!bio) return False(node_isolate); String::Utf8Value passphrase(args[1]); @@ -371,7 +371,7 @@ Handle<Value> SecureContext::SetKey(const Arguments& args) { EVP_PKEY_free(key); BIO_free_all(bio); - return True(); + return True(node_isolate); } @@ -442,7 +442,7 @@ end: Handle<Value> SecureContext::SetCert(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -452,7 +452,7 @@ Handle<Value> SecureContext::SetCert(const Arguments& args) { } BIO* bio = LoadBIO(args[0]); - if (!bio) return False(); + if (!bio) return False(node_isolate); int rv = SSL_CTX_use_certificate_chain(sc->ctx_, bio); @@ -467,13 +467,13 @@ Handle<Value> SecureContext::SetCert(const Arguments& args) { return ThrowCryptoError(err); } - return True(); + return True(node_isolate); } Handle<Value> SecureContext::AddCACert(const Arguments& args) { bool newCAStore = false; - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -487,7 +487,7 @@ Handle<Value> SecureContext::AddCACert(const Arguments& args) { } X509* x509 = LoadX509(args[0]); - if (!x509) return False(); + if (!x509) return False(node_isolate); X509_STORE_add_cert(sc->ca_store_, x509); SSL_CTX_add_client_CA(sc->ctx_, x509); @@ -498,12 +498,12 @@ Handle<Value> SecureContext::AddCACert(const Arguments& args) { SSL_CTX_set_cert_store(sc->ctx_, sc->ca_store_); } - return True(); + return True(node_isolate); } Handle<Value> SecureContext::AddCRL(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -512,13 +512,13 @@ Handle<Value> SecureContext::AddCRL(const Arguments& args) { } BIO *bio = LoadBIO(args[0]); - if (!bio) return False(); + if (!bio) return False(node_isolate); X509_CRL *x509 = PEM_read_bio_X509_CRL(bio, NULL, NULL, NULL); if (x509 == NULL) { BIO_free_all(bio); - return False(); + return False(node_isolate); } X509_STORE_add_crl(sc->ca_store_, x509); @@ -529,13 +529,13 @@ Handle<Value> SecureContext::AddCRL(const Arguments& args) { BIO_free_all(bio); X509_CRL_free(x509); - return True(); + return True(node_isolate); } Handle<Value> SecureContext::AddRootCerts(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -549,14 +549,14 @@ Handle<Value> SecureContext::AddRootCerts(const Arguments& args) { if (!BIO_write(bp, root_certs[i], strlen(root_certs[i]))) { BIO_free_all(bp); - return False(); + return False(node_isolate); } X509 *x509 = PEM_read_bio_X509(bp, NULL, NULL, NULL); if (x509 == NULL) { BIO_free_all(bp); - return False(); + return False(node_isolate); } X509_STORE_add_cert(root_cert_store, x509); @@ -569,12 +569,12 @@ Handle<Value> SecureContext::AddRootCerts(const Arguments& args) { sc->ca_store_ = root_cert_store; SSL_CTX_set_cert_store(sc->ctx_, sc->ca_store_); - return True(); + return True(node_isolate); } Handle<Value> SecureContext::SetCiphers(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -585,11 +585,11 @@ Handle<Value> SecureContext::SetCiphers(const Arguments& args) { String::Utf8Value ciphers(args[0]); SSL_CTX_set_cipher_list(sc->ctx_, *ciphers); - return True(); + return True(node_isolate); } Handle<Value> SecureContext::SetOptions(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -599,11 +599,11 @@ Handle<Value> SecureContext::SetOptions(const Arguments& args) { SSL_CTX_set_options(sc->ctx_, args[0]->IntegerValue()); - return True(); + return True(node_isolate); } Handle<Value> SecureContext::SetSessionIdContext(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); @@ -631,19 +631,19 @@ Handle<Value> SecureContext::SetSessionIdContext(const Arguments& args) { return ThrowException(Exception::TypeError(message)); } - return True(); + return True(node_isolate); } Handle<Value> SecureContext::Close(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); sc->FreeCTXMem(); - return False(); + return False(node_isolate); } //Takes .pfx or .p12 and password in string or buffer format Handle<Value> SecureContext::LoadPKCS12(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); BIO* in = NULL; PKCS12* p12 = NULL; @@ -715,12 +715,12 @@ Handle<Value> SecureContext::LoadPKCS12(const Arguments& args) { return ThrowException(Exception::Error(String::New(str))); } - return True(); + return True(node_isolate); } size_t ClientHelloParser::Write(const uint8_t* data, size_t len) { - HandleScope scope; + HandleScope scope(node_isolate); // Just accumulate data, everything will be pushed to BIO later if (state_ == kPaused) return 0; @@ -888,7 +888,7 @@ int Connection::HandleBIOError(BIO *bio, const char* func, int rv) { static char ssl_error_buf[512]; ERR_error_string_n(rv, ssl_error_buf, sizeof(ssl_error_buf)); - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> e = Exception::Error(String::New(ssl_error_buf)); handle_->Set(String::New("error"), e); @@ -929,7 +929,7 @@ int Connection::HandleSSLError(const char* func, int rv, ZeroStatus zs) { return 0; } else { - HandleScope scope; + HandleScope scope(node_isolate); BUF_MEM* mem; BIO *bio; @@ -957,7 +957,7 @@ int Connection::HandleSSLError(const char* func, int rv, ZeroStatus zs) { void Connection::ClearError() { #ifndef NDEBUG - HandleScope scope; + HandleScope scope(node_isolate); // We should clear the error in JS-land assert(handle_->Get(String::New("error"))->BooleanValue() == false); @@ -966,22 +966,22 @@ void Connection::ClearError() { void Connection::SetShutdownFlags() { - HandleScope scope; + HandleScope scope(node_isolate); int flags = SSL_get_shutdown(ssl_); if (flags & SSL_SENT_SHUTDOWN) { - handle_->Set(String::New("sentShutdown"), True()); + handle_->Set(String::New("sentShutdown"), True(node_isolate)); } if (flags & SSL_RECEIVED_SHUTDOWN) { - handle_->Set(String::New("receivedShutdown"), True()); + handle_->Set(String::New("receivedShutdown"), True(node_isolate)); } } void Connection::Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(Connection::New); t->InstanceTemplate()->SetInternalFieldCount(1); @@ -1105,7 +1105,8 @@ int Connection::SelectNextProtoCallback_(SSL *s, *outlen = 8; // set status unsupported - p->selectedNPNProto_ = Persistent<Value>::New(node_isolate, False()); + p->selectedNPNProto_ = Persistent<Value>::New(node_isolate, + False(node_isolate)); return SSL_TLSEXT_ERR_OK; } @@ -1118,7 +1119,8 @@ int Connection::SelectNextProtoCallback_(SSL *s, switch (status) { case OPENSSL_NPN_UNSUPPORTED: - p->selectedNPNProto_ = Persistent<Value>::New(node_isolate, Null()); + p->selectedNPNProto_ = Persistent<Value>::New(node_isolate, + Null(node_isolate)); break; case OPENSSL_NPN_NEGOTIATED: p->selectedNPNProto_ = Persistent<Value>::New(node_isolate, String::New( @@ -1126,7 +1128,8 @@ int Connection::SelectNextProtoCallback_(SSL *s, )); break; case OPENSSL_NPN_NO_OVERLAP: - p->selectedNPNProto_ = Persistent<Value>::New(node_isolate, False()); + p->selectedNPNProto_ = Persistent<Value>::New(node_isolate, + False(node_isolate)); break; default: break; @@ -1138,7 +1141,7 @@ int Connection::SelectNextProtoCallback_(SSL *s, #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB int Connection::SelectSNIContextCallback_(SSL *s, int *ad, void* arg) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *p = static_cast<Connection*> SSL_get_app_data(s); @@ -1161,7 +1164,8 @@ int Connection::SelectSNIContextCallback_(SSL *s, int *ad, void* arg) { Local<Value> argv[1] = {*p->servername_}; // Call it - Local<Value> ret = Local<Value>::New(MakeCallback(p->sniObject_, + Local<Value> ret = Local<Value>::New(node_isolate, + MakeCallback(p->sniObject_, "onselect", ARRAY_SIZE(argv), argv)); @@ -1183,7 +1187,7 @@ int Connection::SelectSNIContextCallback_(SSL *s, int *ad, void* arg) { #endif Handle<Value> Connection::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *p = new Connection(); p->Wrap(args.Holder()); @@ -1272,7 +1276,7 @@ void Connection::SSLInfoCallback(const SSL *ssl_, int where, int ret) { // a non-const SSL* in OpenSSL <= 0.9.7e. SSL* ssl = const_cast<SSL*>(ssl_); if (where & SSL_CB_HANDSHAKE_START) { - HandleScope scope; + HandleScope scope(node_isolate); Connection* c = static_cast<Connection*>(SSL_get_app_data(ssl)); if (onhandshakestart_sym.IsEmpty()) { onhandshakestart_sym = NODE_PSYMBOL("onhandshakestart"); @@ -1280,7 +1284,7 @@ void Connection::SSLInfoCallback(const SSL *ssl_, int where, int ret) { MakeCallback(c->handle_, onhandshakestart_sym, 0, NULL); } if (where & SSL_CB_HANDSHAKE_DONE) { - HandleScope scope; + HandleScope scope(node_isolate); Connection* c = static_cast<Connection*>(SSL_get_app_data(ssl)); if (onhandshakedone_sym.IsEmpty()) { onhandshakedone_sym = NODE_PSYMBOL("onhandshakedone"); @@ -1291,7 +1295,7 @@ void Connection::SSLInfoCallback(const SSL *ssl_, int where, int ret) { Handle<Value> Connection::EncIn(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1332,12 +1336,12 @@ Handle<Value> Connection::EncIn(const Arguments& args) { ss->SetShutdownFlags(); } - return scope.Close(Integer::New(bytes_written)); + return scope.Close(Integer::New(bytes_written, node_isolate)); } Handle<Value> Connection::ClearOut(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1377,39 +1381,39 @@ Handle<Value> Connection::ClearOut(const Arguments& args) { ss->HandleSSLError("SSL_connect:ClearOut", rv, kZeroIsAnError); } - if (rv < 0) return scope.Close(Integer::New(rv)); + if (rv < 0) return scope.Close(Integer::New(rv, node_isolate)); } int bytes_read = SSL_read(ss->ssl_, buffer_data + off, len); ss->HandleSSLError("SSL_read:ClearOut", bytes_read, kZeroIsNotAnError); ss->SetShutdownFlags(); - return scope.Close(Integer::New(bytes_read)); + return scope.Close(Integer::New(bytes_read, node_isolate)); } Handle<Value> Connection::ClearPending(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); int bytes_pending = BIO_pending(ss->bio_read_); - return scope.Close(Integer::New(bytes_pending)); + return scope.Close(Integer::New(bytes_pending, node_isolate)); } Handle<Value> Connection::EncPending(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); int bytes_pending = BIO_pending(ss->bio_write_); - return scope.Close(Integer::New(bytes_pending)); + return scope.Close(Integer::New(bytes_pending, node_isolate)); } Handle<Value> Connection::EncOut(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1443,12 +1447,12 @@ Handle<Value> Connection::EncOut(const Arguments& args) { ss->HandleBIOError(ss->bio_write_, "BIO_read:EncOut", bytes_read); ss->SetShutdownFlags(); - return scope.Close(Integer::New(bytes_read)); + return scope.Close(Integer::New(bytes_read, node_isolate)); } Handle<Value> Connection::ClearIn(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1487,7 +1491,7 @@ Handle<Value> Connection::ClearIn(const Arguments& args) { ss->HandleSSLError("SSL_connect:ClearIn", rv, kZeroIsAnError); } - if (rv < 0) return scope.Close(Integer::New(rv)); + if (rv < 0) return scope.Close(Integer::New(rv, node_isolate)); } int bytes_written = SSL_write(ss->ssl_, buffer_data + off, len); @@ -1495,16 +1499,16 @@ Handle<Value> Connection::ClearIn(const Arguments& args) { ss->HandleSSLError("SSL_write:ClearIn", bytes_written, kZeroIsAnError); ss->SetShutdownFlags(); - return scope.Close(Integer::New(bytes_written)); + return scope.Close(Integer::New(bytes_written, node_isolate)); } Handle<Value> Connection::GetPeerCertificate(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); - if (ss->ssl_ == NULL) return Undefined(); + if (ss->ssl_ == NULL) return Undefined(node_isolate); Local<Object> info = Object::New(); X509* peer_cert = SSL_get_peer_certificate(ss->ssl_); if (peer_cert != NULL) { @@ -1606,7 +1610,7 @@ Handle<Value> Connection::GetPeerCertificate(const Arguments& args) { for (int i = 0; i < sk_ASN1_OBJECT_num(eku); i++) { memset(buf, 0, sizeof(buf)); OBJ_obj2txt(buf, sizeof(buf) - 1, sk_ASN1_OBJECT_value(eku, i), 1); - ext_key_usage->Set(Integer::New(i), String::New(buf)); + ext_key_usage->Set(Integer::New(i, node_isolate), String::New(buf)); } sk_ASN1_OBJECT_pop_free(eku, ASN1_OBJECT_free); @@ -1619,14 +1623,14 @@ Handle<Value> Connection::GetPeerCertificate(const Arguments& args) { } Handle<Value> Connection::GetSession(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); - if (ss->ssl_ == NULL) return Undefined(); + if (ss->ssl_ == NULL) return Undefined(node_isolate); SSL_SESSION* sess = SSL_get_session(ss->ssl_); - if (!sess) return Undefined(); + if (!sess) return Undefined(node_isolate); int slen = i2d_SSL_SESSION(sess, NULL); assert(slen > 0); @@ -1640,11 +1644,11 @@ Handle<Value> Connection::GetSession(const Arguments& args) { return scope.Close(s); } - return Null(); + return Null(node_isolate); } Handle<Value> Connection::SetSession(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1673,7 +1677,7 @@ Handle<Value> Connection::SetSession(const Arguments& args) { delete [] sbuf; if (!sess) - return Undefined(); + return Undefined(node_isolate); int r = SSL_set_session(ss->ssl_, sess); SSL_SESSION_free(sess); @@ -1683,11 +1687,11 @@ Handle<Value> Connection::SetSession(const Arguments& args) { return ThrowException(Exception::Error(eStr)); } - return True(); + return True(node_isolate); } Handle<Value> Connection::LoadSession(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1707,24 +1711,24 @@ Handle<Value> Connection::LoadSession(const Arguments& args) { ss->hello_parser_.Finish(); - return True(); + return True(node_isolate); } Handle<Value> Connection::IsSessionReused(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); if (ss->ssl_ == NULL || SSL_session_reused(ss->ssl_) == false) { - return False(); + return False(node_isolate); } - return True(); + return True(node_isolate); } Handle<Value> Connection::Start(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1738,60 +1742,60 @@ Handle<Value> Connection::Start(const Arguments& args) { ss->HandleSSLError("SSL_connect:Start", rv, kZeroIsAnError); } - return scope.Close(Integer::New(rv)); + return scope.Close(Integer::New(rv, node_isolate)); } - return scope.Close(Integer::New(0)); + return scope.Close(Integer::New(0, node_isolate)); } Handle<Value> Connection::Shutdown(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); - if (ss->ssl_ == NULL) return False(); + if (ss->ssl_ == NULL) return False(node_isolate); int rv = SSL_shutdown(ss->ssl_); ss->HandleSSLError("SSL_shutdown", rv, kZeroIsNotAnError); ss->SetShutdownFlags(); - return scope.Close(Integer::New(rv)); + return scope.Close(Integer::New(rv, node_isolate)); } Handle<Value> Connection::ReceivedShutdown(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); - if (ss->ssl_ == NULL) return False(); + if (ss->ssl_ == NULL) return False(node_isolate); int r = SSL_get_shutdown(ss->ssl_); - if (r & SSL_RECEIVED_SHUTDOWN) return True(); + if (r & SSL_RECEIVED_SHUTDOWN) return True(node_isolate); - return False(); + return False(node_isolate); } Handle<Value> Connection::IsInitFinished(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); if (ss->ssl_ == NULL || SSL_is_init_finished(ss->ssl_) == false) { - return False(); + return False(node_isolate); } - return True(); + return True(node_isolate); } Handle<Value> Connection::VerifyError(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); - if (ss->ssl_ == NULL) return Null(); + if (ss->ssl_ == NULL) return Null(node_isolate); // XXX Do this check in JS land? @@ -1812,7 +1816,7 @@ Handle<Value> Connection::VerifyError(const Arguments& args) { switch (x509_verify_error) { case X509_V_OK: - return Null(); + return Null(node_isolate); case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: s = String::New("UNABLE_TO_GET_ISSUER_CERT"); @@ -1932,15 +1936,15 @@ Handle<Value> Connection::VerifyError(const Arguments& args) { Handle<Value> Connection::GetCurrentCipher(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); OPENSSL_CONST SSL_CIPHER *c; - if ( ss->ssl_ == NULL ) return Undefined(); + if ( ss->ssl_ == NULL ) return Undefined(node_isolate); c = SSL_get_current_cipher(ss->ssl_); - if ( c == NULL ) return Undefined(); + if ( c == NULL ) return Undefined(node_isolate); Local<Object> info = Object::New(); const char* cipher_name = SSL_CIPHER_get_name(c); info->Set(name_symbol, String::New(cipher_name)); @@ -1950,7 +1954,7 @@ Handle<Value> Connection::GetCurrentCipher(const Arguments& args) { } Handle<Value> Connection::Close(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1958,12 +1962,12 @@ Handle<Value> Connection::Close(const Arguments& args) { SSL_free(ss->ssl_); ss->ssl_ = NULL; } - return True(); + return True(node_isolate); } #ifdef OPENSSL_NPN_NEGOTIATED Handle<Value> Connection::GetNegotiatedProto(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1974,7 +1978,7 @@ Handle<Value> Connection::GetNegotiatedProto(const Arguments& args) { SSL_get0_next_proto_negotiated(ss->ssl_, &npn_proto, &npn_proto_len); if (!npn_proto) { - return False(); + return False(node_isolate); } return String::New((const char*) npn_proto, npn_proto_len); @@ -1984,7 +1988,7 @@ Handle<Value> Connection::GetNegotiatedProto(const Arguments& args) { } Handle<Value> Connection::SetNPNProtocols(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -1999,25 +2003,25 @@ Handle<Value> Connection::SetNPNProtocols(const Arguments& args) { } ss->npnProtos_ = Persistent<Object>::New(node_isolate, args[0]->ToObject()); - return True(); + return True(node_isolate); }; #endif #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB Handle<Value> Connection::GetServername(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); if (ss->is_server_ && !ss->servername_.IsEmpty()) { return ss->servername_; } else { - return False(); + return False(node_isolate); } } Handle<Value> Connection::SetSNICallback(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Connection *ss = Connection::Unwrap(args); @@ -2033,13 +2037,13 @@ Handle<Value> Connection::SetSNICallback(const Arguments& args) { ss->sniObject_ = Persistent<Object>::New(node_isolate, Object::New()); ss->sniObject_->Set(String::New("onselect"), args[0]); - return True(); + return True(node_isolate); } #endif void CipherBase::Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); @@ -2056,7 +2060,7 @@ void CipherBase::Initialize(Handle<Object> target) { Handle<Value> CipherBase::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); CipherBase* cipher = new CipherBase(args[0]->IsTrue() ? kCipher : kDecipher); cipher->Wrap(args.This()); @@ -2067,7 +2071,7 @@ Handle<Value> CipherBase::New(const Arguments& args) { Handle<Value> CipherBase::Init(char* cipher_type, char* key_buf, int key_buf_len) { - HandleScope scope; + HandleScope scope(node_isolate); assert(cipher_ == NULL); cipher_ = EVP_get_cipherbyname(cipher_type); @@ -2101,12 +2105,12 @@ Handle<Value> CipherBase::Init(char* cipher_type, reinterpret_cast<unsigned char*>(iv), kind_ == kCipher); initialised_ = true; - return Null(); + return Null(node_isolate); } Handle<Value> CipherBase::Init(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); CipherBase* cipher = ObjectWrap::Unwrap<CipherBase>(args.This()); @@ -2135,7 +2139,7 @@ Handle<Value> CipherBase::InitIv(char* cipher_type, int key_len, char* iv, int iv_len) { - HandleScope scope; + HandleScope scope(node_isolate); cipher_ = EVP_get_cipherbyname(cipher_type); if (cipher_ == NULL) { @@ -2162,12 +2166,12 @@ Handle<Value> CipherBase::InitIv(char* cipher_type, reinterpret_cast<unsigned char*>(iv), kind_ == kCipher); initialised_ = true; - return Null(); + return Null(node_isolate); } Handle<Value> CipherBase::InitIv(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); CipherBase* cipher = ObjectWrap::Unwrap<CipherBase>(args.This()); @@ -2215,7 +2219,7 @@ bool CipherBase::Update(char* data, Handle<Value> CipherBase::Update(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); CipherBase* cipher = ObjectWrap::Unwrap<CipherBase>(args.This()); @@ -2247,13 +2251,13 @@ bool CipherBase::SetAutoPadding(bool auto_padding) { Handle<Value> CipherBase::SetAutoPadding(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); CipherBase* cipher = ObjectWrap::Unwrap<CipherBase>(args.This()); cipher->SetAutoPadding(args.Length() < 1 || args[0]->BooleanValue()); - return Undefined(); + return Undefined(node_isolate); } @@ -2270,7 +2274,7 @@ bool CipherBase::Final(unsigned char** out, int *out_len) { Handle<Value> CipherBase::Final(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); CipherBase* cipher = ObjectWrap::Unwrap<CipherBase>(args.This()); @@ -2294,7 +2298,7 @@ Handle<Value> CipherBase::Final(const Arguments& args) { void Hmac::Initialize(v8::Handle<v8::Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); @@ -2309,7 +2313,7 @@ void Hmac::Initialize(v8::Handle<v8::Object> target) { Handle<Value> Hmac::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Hmac* hmac = new Hmac(); hmac->Wrap(args.This()); @@ -2318,7 +2322,7 @@ Handle<Value> Hmac::New(const Arguments& args) { Handle<Value> Hmac::HmacInit(char* hashType, char* key, int key_len) { - HandleScope scope; + HandleScope scope(node_isolate); assert(md_ == NULL); md_ = EVP_get_digestbyname(hashType); @@ -2333,12 +2337,12 @@ Handle<Value> Hmac::HmacInit(char* hashType, char* key, int key_len) { } initialised_ = true; - return Null(); + return Null(node_isolate); } Handle<Value> Hmac::HmacInit(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Hmac* hmac = ObjectWrap::Unwrap<Hmac>(args.This()); @@ -2372,7 +2376,7 @@ bool Hmac::HmacUpdate(char* data, int len) { Handle<Value> Hmac::HmacUpdate(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Hmac* hmac = ObjectWrap::Unwrap<Hmac>(args.This()); @@ -2404,7 +2408,7 @@ bool Hmac::HmacDigest(unsigned char** md_value, unsigned int* md_len) { Handle<Value> Hmac::HmacDigest(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Hmac* hmac = ObjectWrap::Unwrap<Hmac>(args.This()); @@ -2425,7 +2429,7 @@ Handle<Value> Hmac::HmacDigest(const Arguments& args) { void Hash::Initialize(v8::Handle<v8::Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); @@ -2439,7 +2443,7 @@ void Hash::Initialize(v8::Handle<v8::Object> target) { Handle<Value> Hash::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() == 0 || !args[0]->IsString()) { return ThrowError("Must give hashtype string as argument"); @@ -2477,7 +2481,7 @@ bool Hash::HashUpdate(char* data, int len) { Handle<Value> Hash::HashUpdate(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Hash* hash = ObjectWrap::Unwrap<Hash>(args.This()); @@ -2498,7 +2502,7 @@ Handle<Value> Hash::HashUpdate(const Arguments& args) { Handle<Value> Hash::HashDigest(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Hash* hash = ObjectWrap::Unwrap<Hash>(args.This()); @@ -2520,7 +2524,7 @@ Handle<Value> Hash::HashDigest(const Arguments& args) { void Sign::Initialize(v8::Handle<v8::Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); @@ -2535,7 +2539,7 @@ void Sign::Initialize(v8::Handle<v8::Object> target) { Handle<Value> Sign::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Sign* sign = new Sign(); sign->Wrap(args.This()); @@ -2545,7 +2549,7 @@ Handle<Value> Sign::New(const Arguments& args) { Handle<Value> Sign::SignInit(const char* sign_type) { - HandleScope scope; + HandleScope scope(node_isolate); assert(md_ == NULL); md_ = EVP_get_digestbyname(sign_type); @@ -2555,12 +2559,12 @@ Handle<Value> Sign::SignInit(const char* sign_type) { EVP_MD_CTX_init(&mdctx_); EVP_SignInit_ex(&mdctx_, md_, NULL); initialised_ = true; - return Null(); + return Null(node_isolate); } Handle<Value> Sign::SignInit(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Sign* sign = ObjectWrap::Unwrap<Sign>(args.This()); @@ -2589,7 +2593,7 @@ bool Sign::SignUpdate(char* data, int len) { Handle<Value> Sign::SignUpdate(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Sign* sign = ObjectWrap::Unwrap<Sign>(args.This()); @@ -2634,7 +2638,7 @@ bool Sign::SignFinal(unsigned char** md_value, Handle<Value> Sign::SignFinal(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Sign* sign = ObjectWrap::Unwrap<Sign>(args.This()); @@ -2664,7 +2668,7 @@ Handle<Value> Sign::SignFinal(const Arguments& args) { void Verify::Initialize(v8::Handle<v8::Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); @@ -2679,7 +2683,7 @@ void Verify::Initialize(v8::Handle<v8::Object> target) { Handle<Value> Verify::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Verify* verify = new Verify(); verify->Wrap(args.This()); @@ -2689,7 +2693,7 @@ Handle<Value> Verify::New(const Arguments& args) { Handle<Value> Verify::VerifyInit(const char* verify_type) { - HandleScope scope; + HandleScope scope(node_isolate); assert(md_ == NULL); md_ = EVP_get_digestbyname(verify_type); @@ -2701,12 +2705,12 @@ Handle<Value> Verify::VerifyInit(const char* verify_type) { EVP_VerifyInit_ex(&mdctx_, md_, NULL); initialised_ = true; - return Null(); + return Null(node_isolate); } Handle<Value> Verify::VerifyInit(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Verify* verify = ObjectWrap::Unwrap<Verify>(args.This()); @@ -2735,7 +2739,7 @@ bool Verify::VerifyUpdate(char* data, int len) { Handle<Value> Verify::VerifyUpdate(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Verify* verify = ObjectWrap::Unwrap<Verify>(args.This()); @@ -2760,7 +2764,7 @@ Handle<Value> Verify::VerifyFinal(char* key_pem, int key_pem_len, unsigned char* sig, int siglen) { - HandleScope scope; + HandleScope scope(node_isolate); if (!initialised_) { return ThrowError("Verify not initalised"); @@ -2825,12 +2829,12 @@ exit: return ThrowCryptoError(err); } - return scope.Close(r ? True() : False()); + return scope.Close(r ? True() : False(node_isolate)); } Handle<Value> Verify::VerifyFinal(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Verify* verify = ObjectWrap::Unwrap<Verify>(args.This()); @@ -2847,7 +2851,7 @@ Handle<Value> Verify::VerifyFinal(const Arguments& args) { void DiffieHellman::Initialize(v8::Handle<v8::Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); @@ -2913,7 +2917,7 @@ bool DiffieHellman::Init(unsigned char* p, Handle<Value> DiffieHellman::DiffieHellmanGroup(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = new DiffieHellman(); @@ -2947,7 +2951,7 @@ Handle<Value> DiffieHellman::DiffieHellmanGroup(const Arguments& args) { Handle<Value> DiffieHellman::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = new DiffieHellman(); bool initialized = false; @@ -2973,7 +2977,7 @@ Handle<Value> DiffieHellman::New(const Arguments& args) { Handle<Value> DiffieHellman::GenerateKeys(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = ObjectWrap::Unwrap<DiffieHellman>(args.This()); @@ -3001,7 +3005,7 @@ Handle<Value> DiffieHellman::GenerateKeys(const Arguments& args) { Handle<Value> DiffieHellman::GetPrime(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = ObjectWrap::Unwrap<DiffieHellman>(args.This()); @@ -3025,7 +3029,7 @@ Handle<Value> DiffieHellman::GetPrime(const Arguments& args) { Handle<Value> DiffieHellman::GetGenerator(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = ObjectWrap::Unwrap<DiffieHellman>(args.This()); @@ -3049,7 +3053,7 @@ Handle<Value> DiffieHellman::GetGenerator(const Arguments& args) { Handle<Value> DiffieHellman::GetPublicKey(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = ObjectWrap::Unwrap<DiffieHellman>(args.This()); @@ -3078,7 +3082,7 @@ Handle<Value> DiffieHellman::GetPublicKey(const Arguments& args) { Handle<Value> DiffieHellman::GetPrivateKey(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = ObjectWrap::Unwrap<DiffieHellman>(args.This()); @@ -3107,7 +3111,7 @@ Handle<Value> DiffieHellman::GetPrivateKey(const Arguments& args) { Handle<Value> DiffieHellman::ComputeSecret(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = ObjectWrap::Unwrap<DiffieHellman>(args.This()); @@ -3180,7 +3184,7 @@ Handle<Value> DiffieHellman::ComputeSecret(const Arguments& args) { Handle<Value> DiffieHellman::SetPublicKey(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = ObjectWrap::Unwrap<DiffieHellman>(args.This()); @@ -3203,7 +3207,7 @@ Handle<Value> DiffieHellman::SetPublicKey(const Arguments& args) { Handle<Value> DiffieHellman::SetPrivateKey(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); DiffieHellman* diffieHellman = ObjectWrap::Unwrap<DiffieHellman>(args.This()); @@ -3273,12 +3277,12 @@ void EIO_PBKDF2(uv_work_t* work_req) { void EIO_PBKDF2After(pbkdf2_req* req, Local<Value> argv[2]) { if (req->err) { - argv[0] = Local<Value>::New(Undefined()); + argv[0] = Local<Value>::New(node_isolate, Undefined(node_isolate)); 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<Value>::New(Undefined()); + argv[1] = Local<Value>::New(node_isolate, Undefined(node_isolate)); } delete[] req->pass; @@ -3291,7 +3295,7 @@ void EIO_PBKDF2After(pbkdf2_req* req, Local<Value> argv[2]) { void EIO_PBKDF2After(uv_work_t* work_req, int status) { assert(status == 0); pbkdf2_req* req = container_of(work_req, pbkdf2_req, work_req); - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> argv[2]; Persistent<Object> obj = req->obj; EIO_PBKDF2After(req, argv); @@ -3301,7 +3305,7 @@ void EIO_PBKDF2After(uv_work_t* work_req, int status) { Handle<Value> PBKDF2(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); const char* type_error = NULL; char* pass = NULL; @@ -3380,7 +3384,7 @@ Handle<Value> PBKDF2(const Arguments& args) { &req->work_req, EIO_PBKDF2, EIO_PBKDF2After); - return Undefined(); + return Undefined(node_isolate); } else { Local<Value> argv[2]; EIO_PBKDF2(req); @@ -3451,13 +3455,13 @@ void RandomBytesCheck(RandomBytesRequest* req, Local<Value> argv[2]) { ERR_error_string_n(req->error_, errmsg, sizeof errmsg); argv[0] = Exception::Error(String::New(errmsg)); - argv[1] = Local<Value>::New(Null()); + argv[1] = Local<Value>::New(node_isolate, Null(node_isolate)); } else { // avoids the malloc + memcpy Buffer* buffer = Buffer::New(req->data_, req->size_, RandomBytesFree, NULL); - argv[0] = Local<Value>::New(Null()); - argv[1] = Local<Object>::New(buffer->handle_); + argv[0] = Local<Value>::New(node_isolate, Null(node_isolate)); + argv[1] = Local<Object>::New(node_isolate, buffer->handle_); } } @@ -3467,7 +3471,7 @@ void RandomBytesAfter(uv_work_t* work_req, int status) { RandomBytesRequest* req = container_of(work_req, RandomBytesRequest, work_req_); - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> argv[2]; RandomBytesCheck(req, argv); MakeCallback(req->obj_, "ondone", ARRAY_SIZE(argv), argv); @@ -3477,7 +3481,7 @@ void RandomBytesAfter(uv_work_t* work_req, int status) { template <bool pseudoRandom> Handle<Value> RandomBytes(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); // maybe allow a buffer to write to? cuts down on object creation // when generating random data in a loop @@ -3519,7 +3523,7 @@ Handle<Value> RandomBytes(const Arguments& args) { Handle<Value> GetCiphers(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); SSL_CTX* ctx = SSL_CTX_new(TLSv1_server_method()); if (ctx == NULL) { @@ -3557,7 +3561,7 @@ static void add_hash_to_array(const EVP_MD* md, Handle<Value> GetHashes(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Array> arr = Array::New(); EVP_MD_do_all_sorted(add_hash_to_array, &arr); return scope.Close(arr); @@ -3565,7 +3569,7 @@ Handle<Value> GetHashes(const Arguments& args) { void InitCrypto(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); SSL_library_init(); OpenSSL_add_all_algorithms(); diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc index 534b3b9670..99bc3002d7 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -129,10 +129,10 @@ using namespace v8; Handle<Value> DTRACE_NET_SERVER_CONNECTION(const Arguments& args) { #ifndef HAVE_SYSTEMTAP if (!NODE_NET_SERVER_CONNECTION_ENABLED()) - return Undefined(); + return Undefined(node_isolate); #endif - HandleScope scope; + HandleScope scope(node_isolate); SLURP_CONNECTION(args[0], conn); #ifdef HAVE_SYSTEMTAP @@ -142,16 +142,16 @@ Handle<Value> DTRACE_NET_SERVER_CONNECTION(const Arguments& args) { NODE_NET_SERVER_CONNECTION(&conn); #endif - return Undefined(); + return Undefined(node_isolate); } Handle<Value> DTRACE_NET_STREAM_END(const Arguments& args) { #ifndef HAVE_SYSTEMTAP if (!NODE_NET_STREAM_END_ENABLED()) - return Undefined(); + return Undefined(node_isolate); #endif - HandleScope scope; + HandleScope scope(node_isolate); SLURP_CONNECTION(args[0], conn); #ifdef HAVE_SYSTEMTAP @@ -160,16 +160,16 @@ Handle<Value> DTRACE_NET_STREAM_END(const Arguments& args) { NODE_NET_STREAM_END(&conn); #endif - return Undefined(); + return Undefined(node_isolate); } Handle<Value> DTRACE_NET_SOCKET_READ(const Arguments& args) { #ifndef HAVE_SYSTEMTAP if (!NODE_NET_SOCKET_READ_ENABLED()) - return Undefined(); + return Undefined(node_isolate); #endif - HandleScope scope; + HandleScope scope(node_isolate); SLURP_CONNECTION(args[0], conn); @@ -184,16 +184,16 @@ Handle<Value> DTRACE_NET_SOCKET_READ(const Arguments& args) { NODE_NET_SOCKET_READ(&conn, nbytes); #endif - return Undefined(); + return Undefined(node_isolate); } Handle<Value> DTRACE_NET_SOCKET_WRITE(const Arguments& args) { #ifndef HAVE_SYSTEMTAP if (!NODE_NET_SOCKET_WRITE_ENABLED()) - return Undefined(); + return Undefined(node_isolate); #endif - HandleScope scope; + HandleScope scope(node_isolate); SLURP_CONNECTION(args[0], conn); @@ -208,7 +208,7 @@ Handle<Value> DTRACE_NET_SOCKET_WRITE(const Arguments& args) { NODE_NET_SOCKET_WRITE(&conn, nbytes); #endif - return Undefined(); + return Undefined(node_isolate); } Handle<Value> DTRACE_HTTP_SERVER_REQUEST(const Arguments& args) { @@ -216,10 +216,10 @@ Handle<Value> DTRACE_HTTP_SERVER_REQUEST(const Arguments& args) { #ifndef HAVE_SYSTEMTAP if (!NODE_HTTP_SERVER_REQUEST_ENABLED()) - return Undefined(); + return Undefined(node_isolate); #endif - HandleScope scope; + HandleScope scope(node_isolate); Local<Object> arg0 = Local<Object>::Cast(args[0]); Local<Object> headers; @@ -249,16 +249,16 @@ Handle<Value> DTRACE_HTTP_SERVER_REQUEST(const Arguments& args) { #else NODE_HTTP_SERVER_REQUEST(&req, &conn); #endif - return Undefined(); + return Undefined(node_isolate); } Handle<Value> DTRACE_HTTP_SERVER_RESPONSE(const Arguments& args) { #ifndef HAVE_SYSTEMTAP if (!NODE_HTTP_SERVER_RESPONSE_ENABLED()) - return Undefined(); + return Undefined(node_isolate); #endif - HandleScope scope; + HandleScope scope(node_isolate); SLURP_CONNECTION(args[0], conn); #ifdef HAVE_SYSTEMTAP @@ -267,7 +267,7 @@ Handle<Value> DTRACE_HTTP_SERVER_RESPONSE(const Arguments& args) { NODE_HTTP_SERVER_RESPONSE(&conn); #endif - return Undefined(); + return Undefined(node_isolate); } Handle<Value> DTRACE_HTTP_CLIENT_REQUEST(const Arguments& args) { @@ -276,10 +276,10 @@ Handle<Value> DTRACE_HTTP_CLIENT_REQUEST(const Arguments& args) { #ifndef HAVE_SYSTEMTAP if (!NODE_HTTP_CLIENT_REQUEST_ENABLED()) - return Undefined(); + return Undefined(node_isolate); #endif - HandleScope scope; + HandleScope scope(node_isolate); /* * For the method and URL, we're going to dig them out of the header. This @@ -312,15 +312,15 @@ Handle<Value> DTRACE_HTTP_CLIENT_REQUEST(const Arguments& args) { #else NODE_HTTP_CLIENT_REQUEST(&req, &conn); #endif - return Undefined(); + return Undefined(node_isolate); } Handle<Value> DTRACE_HTTP_CLIENT_RESPONSE(const Arguments& args) { #ifndef HAVE_SYSTEMTAP if (!NODE_HTTP_CLIENT_RESPONSE_ENABLED()) - return Undefined(); + return Undefined(node_isolate); #endif - HandleScope scope; + HandleScope scope(node_isolate); SLURP_CONNECTION_HTTP_CLIENT_RESPONSE(args[0], args[1], conn); #ifdef HAVE_SYSTEMTAP @@ -329,7 +329,7 @@ Handle<Value> DTRACE_HTTP_CLIENT_RESPONSE(const Arguments& args) { NODE_HTTP_CLIENT_RESPONSE(&conn); #endif - return Undefined(); + return Undefined(node_isolate); } #define NODE_PROBE(name) #name, name, Persistent<FunctionTemplate>() diff --git a/src/node_file.cc b/src/node_file.cc index 52a300a18c..684044401d 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -81,7 +81,7 @@ static inline int IsInt64(double x) { static void After(uv_fs_t *req) { - HandleScope scope; + HandleScope scope(node_isolate); FSReqWrap* req_wrap = (FSReqWrap*) req->data; assert(&req_wrap->req_ == req); @@ -110,7 +110,7 @@ static void After(uv_fs_t *req) { } } else { // error value is empty or null for non-error. - argv[0] = Local<Value>::New(Null()); + argv[0] = Local<Value>::New(node_isolate, Null(node_isolate)); // All have at least two args now. argc = 2; @@ -141,11 +141,11 @@ static void After(uv_fs_t *req) { break; case UV_FS_OPEN: - argv[1] = Integer::New(req->result); + argv[1] = Integer::New(req->result, node_isolate); break; case UV_FS_WRITE: - argv[1] = Integer::New(req->result); + argv[1] = Integer::New(req->result, node_isolate); break; case UV_FS_STAT: @@ -160,7 +160,7 @@ static void After(uv_fs_t *req) { case UV_FS_READ: // Buffer interface - argv[1] = Integer::New(req->result); + argv[1] = Integer::New(req->result, node_isolate); break; case UV_FS_READDIR: @@ -172,7 +172,7 @@ static void After(uv_fs_t *req) { for (int i = 0; i < nnames; i++) { Local<String> name = String::New(namebuf); - names->Set(Integer::New(i), name); + names->Set(Integer::New(i, node_isolate), name); #ifndef NDEBUG namebuf += strlen(namebuf); assert(*namebuf == '\0'); @@ -241,7 +241,7 @@ struct fs_req_wrap { static Handle<Value> Close(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1 || !args[0]->IsInt32()) { return THROW_BAD_ARGS; @@ -253,7 +253,7 @@ static Handle<Value> Close(const Arguments& args) { ASYNC_CALL(close, args[1], fd) } else { SYNC_CALL(close, 0, fd) - return Undefined(); + return Undefined(node_isolate); } } @@ -275,7 +275,7 @@ static Persistent<String> mtime_symbol; static Persistent<String> ctime_symbol; Local<Object> BuildStatsObject(const uv_statbuf_t* s) { - HandleScope scope; + HandleScope scope(node_isolate); if (dev_symbol.IsEmpty()) { dev_symbol = NODE_PSYMBOL("dev"); @@ -311,7 +311,7 @@ Local<Object> BuildStatsObject(const uv_statbuf_t* s) { // and make sure that we bail out when V8 returns an empty handle. #define X(name) \ { \ - Local<Value> val = Integer::New(s->st_##name); \ + Local<Value> val = Integer::New(s->st_##name, node_isolate); \ if (val.IsEmpty()) return Local<Object>(); \ stats->Set(name##_symbol, val); \ } @@ -354,7 +354,7 @@ Local<Object> BuildStatsObject(const uv_statbuf_t* s) { } static Handle<Value> Stat(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); @@ -371,7 +371,7 @@ static Handle<Value> Stat(const Arguments& args) { } static Handle<Value> LStat(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); @@ -388,7 +388,7 @@ static Handle<Value> LStat(const Arguments& args) { } static Handle<Value> FStat(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1 || !args[0]->IsInt32()) { return THROW_BAD_ARGS; @@ -406,7 +406,7 @@ static Handle<Value> FStat(const Arguments& args) { } static Handle<Value> Symlink(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int len = args.Length(); if (len < 1) return TYPE_ERROR("dest path required"); @@ -434,12 +434,12 @@ static Handle<Value> Symlink(const Arguments& args) { ASYNC_CALL(symlink, args[3], *dest, *path, flags) } else { SYNC_CALL(symlink, *path, *dest, *path, flags) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> Link(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int len = args.Length(); if (len < 1) return TYPE_ERROR("dest path required"); @@ -454,12 +454,12 @@ static Handle<Value> Link(const Arguments& args) { ASYNC_CALL(link, args[2], *orig_path, *new_path) } else { SYNC_CALL(link, *orig_path, *orig_path, *new_path) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> ReadLink(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); @@ -475,7 +475,7 @@ static Handle<Value> ReadLink(const Arguments& args) { } static Handle<Value> Rename(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int len = args.Length(); if (len < 1) return TYPE_ERROR("old path required"); @@ -490,12 +490,12 @@ static Handle<Value> Rename(const Arguments& args) { ASYNC_CALL(rename, args[2], *old_path, *new_path) } else { SYNC_CALL(rename, *old_path, *old_path, *new_path) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> FTruncate(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 2 || !args[0]->IsInt32()) { return THROW_BAD_ARGS; @@ -510,12 +510,12 @@ static Handle<Value> FTruncate(const Arguments& args) { ASYNC_CALL(ftruncate, args[2], fd, len) } else { SYNC_CALL(ftruncate, 0, fd, len) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> Fdatasync(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1 || !args[0]->IsInt32()) { return THROW_BAD_ARGS; @@ -527,12 +527,12 @@ static Handle<Value> Fdatasync(const Arguments& args) { ASYNC_CALL(fdatasync, args[1], fd) } else { SYNC_CALL(fdatasync, 0, fd) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> Fsync(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1 || !args[0]->IsInt32()) { return THROW_BAD_ARGS; @@ -544,12 +544,12 @@ static Handle<Value> Fsync(const Arguments& args) { ASYNC_CALL(fsync, args[1], fd) } else { SYNC_CALL(fsync, 0, fd) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> Unlink(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); @@ -560,12 +560,12 @@ static Handle<Value> Unlink(const Arguments& args) { ASYNC_CALL(unlink, args[1], *path) } else { SYNC_CALL(unlink, *path, *path) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> RMDir(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); @@ -576,12 +576,12 @@ static Handle<Value> RMDir(const Arguments& args) { ASYNC_CALL(rmdir, args[1], *path) } else { SYNC_CALL(rmdir, *path, *path) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> MKDir(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 2 || !args[0]->IsString() || !args[1]->IsInt32()) { return THROW_BAD_ARGS; @@ -594,12 +594,12 @@ static Handle<Value> MKDir(const Arguments& args) { ASYNC_CALL(mkdir, args[2], *path, mode) } else { SYNC_CALL(mkdir, *path, *path, mode) - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> ReadDir(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1) return TYPE_ERROR("path required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); @@ -617,7 +617,7 @@ static Handle<Value> ReadDir(const Arguments& args) { for (int i = 0; i < nnames; i++) { Local<String> name = String::New(namebuf); - names->Set(Integer::New(i), name); + names->Set(Integer::New(i, node_isolate), name); #ifndef NDEBUG namebuf += strlen(namebuf); assert(*namebuf == '\0'); @@ -632,7 +632,7 @@ static Handle<Value> ReadDir(const Arguments& args) { } static Handle<Value> Open(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int len = args.Length(); if (len < 1) return TYPE_ERROR("path required"); @@ -651,7 +651,7 @@ static Handle<Value> Open(const Arguments& args) { } else { SYNC_CALL(open, *path, *path, flags, mode) int fd = SYNC_RESULT; - return scope.Close(Integer::New(fd)); + return scope.Close(Integer::New(fd, node_isolate)); } } @@ -665,7 +665,7 @@ static Handle<Value> Open(const Arguments& args) { // 4 position if integer, position to write at in the file. // if null, write from the current position static Handle<Value> Write(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (!args[0]->IsInt32()) { return THROW_BAD_ARGS; @@ -704,7 +704,7 @@ static Handle<Value> Write(const Arguments& args) { ASYNC_CALL(write, cb, fd, buf, len, pos) } else { SYNC_CALL(write, 0, fd, buf, len, pos) - return scope.Close(Integer::New(SYNC_RESULT)); + return scope.Close(Integer::New(SYNC_RESULT, node_isolate)); } } @@ -721,7 +721,7 @@ static Handle<Value> Write(const Arguments& args) { * */ static Handle<Value> Read(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 2 || !args[0]->IsInt32()) { return THROW_BAD_ARGS; @@ -767,7 +767,7 @@ static Handle<Value> Read(const Arguments& args) { ASYNC_CALL(read, cb, fd, buf, len, pos); } else { SYNC_CALL(read, 0, fd, buf, len, pos) - Local<Integer> bytesRead = Integer::New(SYNC_RESULT); + Local<Integer> bytesRead = Integer::New(SYNC_RESULT, node_isolate); return scope.Close(bytesRead); } } @@ -777,7 +777,7 @@ static Handle<Value> Read(const Arguments& args) { * Wrapper for chmod(1) / EIO_CHMOD */ static Handle<Value> Chmod(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if(args.Length() < 2 || !args[0]->IsString() || !args[1]->IsInt32()) { return THROW_BAD_ARGS; @@ -789,7 +789,7 @@ static Handle<Value> Chmod(const Arguments& args) { ASYNC_CALL(chmod, args[2], *path, mode); } else { SYNC_CALL(chmod, *path, *path, mode); - return Undefined(); + return Undefined(node_isolate); } } @@ -798,7 +798,7 @@ static Handle<Value> Chmod(const Arguments& args) { * Wrapper for fchmod(1) / EIO_FCHMOD */ static Handle<Value> FChmod(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if(args.Length() < 2 || !args[0]->IsInt32() || !args[1]->IsInt32()) { return THROW_BAD_ARGS; @@ -810,7 +810,7 @@ static Handle<Value> FChmod(const Arguments& args) { ASYNC_CALL(fchmod, args[2], fd, mode); } else { SYNC_CALL(fchmod, 0, fd, mode); - return Undefined(); + return Undefined(node_isolate); } } @@ -819,7 +819,7 @@ static Handle<Value> FChmod(const Arguments& args) { * Wrapper for chown(1) / EIO_CHOWN */ static Handle<Value> Chown(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int len = args.Length(); if (len < 1) return TYPE_ERROR("path required"); @@ -837,7 +837,7 @@ static Handle<Value> Chown(const Arguments& args) { ASYNC_CALL(chown, args[3], *path, uid, gid); } else { SYNC_CALL(chown, *path, *path, uid, gid); - return Undefined(); + return Undefined(node_isolate); } } @@ -846,7 +846,7 @@ static Handle<Value> Chown(const Arguments& args) { * Wrapper for fchown(1) / EIO_FCHOWN */ static Handle<Value> FChown(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int len = args.Length(); if (len < 1) return TYPE_ERROR("fd required"); @@ -864,13 +864,13 @@ static Handle<Value> FChown(const Arguments& args) { ASYNC_CALL(fchown, args[3], fd, uid, gid); } else { SYNC_CALL(fchown, 0, fd, uid, gid); - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> UTimes(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int len = args.Length(); if (len < 1) return TYPE_ERROR("path required"); @@ -888,12 +888,12 @@ static Handle<Value> UTimes(const Arguments& args) { ASYNC_CALL(utime, args[3], *path, atime, mtime); } else { SYNC_CALL(utime, *path, *path, atime, mtime); - return Undefined(); + return Undefined(node_isolate); } } static Handle<Value> FUTimes(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int len = args.Length(); if (len < 1) return TYPE_ERROR("fd required"); @@ -911,13 +911,13 @@ static Handle<Value> FUTimes(const Arguments& args) { ASYNC_CALL(futime, args[3], fd, atime, mtime); } else { SYNC_CALL(futime, 0, fd, atime, mtime); - return Undefined(); + return Undefined(node_isolate); } } void File::Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); NODE_SET_METHOD(target, "close", Close); NODE_SET_METHOD(target, "open", Open); @@ -951,7 +951,7 @@ void File::Initialize(Handle<Object> target) { } void InitFs(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); // Initialize the stats object Local<FunctionTemplate> stat_templ = FunctionTemplate::New(); stats_constructor_template = Persistent<FunctionTemplate>::New(node_isolate, diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc index 493f1e065e..782bdf9bc9 100644 --- a/src/node_http_parser.cc +++ b/src/node_http_parser.cc @@ -170,7 +170,7 @@ struct StringPtr { if (str_) return String::New(str_, size_); else - return String::Empty(); + return String::Empty(node_isolate); } @@ -270,22 +270,22 @@ public: // STATUS if (parser_.type == HTTP_RESPONSE) { message_info->Set(status_code_sym, - Integer::New(parser_.status_code)); + Integer::New(parser_.status_code, node_isolate)); } // VERSION message_info->Set(version_major_sym, - Integer::New(parser_.http_major)); + Integer::New(parser_.http_major, node_isolate)); message_info->Set(version_minor_sym, - Integer::New(parser_.http_minor)); + Integer::New(parser_.http_minor, node_isolate)); message_info->Set(should_keep_alive_sym, - http_should_keep_alive(&parser_) ? True() - : False()); + http_should_keep_alive(&parser_) ? True(node_isolate) + : False(node_isolate)); message_info->Set(upgrade_sym, - parser_.upgrade ? True() - : False()); + parser_.upgrade ? True(node_isolate) + : False(node_isolate)); Local<Value> argv[1] = { message_info }; @@ -302,7 +302,7 @@ public: HTTP_DATA_CB(on_body) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> cb = handle_->Get(on_body_sym); if (!cb->IsFunction()) @@ -310,8 +310,8 @@ public: Local<Value> argv[3] = { *current_buffer, - Integer::New(at - current_buffer_data), - Integer::New(length) + Integer::New(at - current_buffer_data, node_isolate), + Integer::New(length, node_isolate) }; Local<Value> r = Local<Function>::Cast(cb)->Call(handle_, 3, argv); @@ -326,7 +326,7 @@ public: HTTP_CB(on_message_complete) { - HandleScope scope; + HandleScope scope(node_isolate); if (num_fields_) Flush(); // Flush trailing HTTP headers. @@ -348,7 +348,7 @@ public: static Handle<Value> New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); http_parser_type type = static_cast<http_parser_type>(args[0]->Int32Value()); @@ -380,7 +380,7 @@ public: // var bytesParsed = parser->execute(buffer, off, len); static Handle<Value> Execute(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Parser* parser = ObjectWrap::Unwrap<Parser>(args.This()); @@ -434,7 +434,7 @@ public: // If there was an exception in one of the callbacks if (parser->got_exception_) return Local<Value>(); - Local<Integer> nparsed_obj = Integer::New(nparsed); + Local<Integer> nparsed_obj = Integer::New(nparsed, node_isolate); // If there was a parse error in one of the callbacks // TODO What if there is an error on EOF? if (!parser->parser_.upgrade && nparsed != len) { @@ -452,7 +452,7 @@ public: static Handle<Value> Finish(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Parser* parser = ObjectWrap::Unwrap<Parser>(args.This()); @@ -468,17 +468,17 @@ public: Local<Value> e = Exception::Error(String::NewSymbol("Parse Error")); Local<Object> obj = e->ToObject(); - obj->Set(String::NewSymbol("bytesParsed"), Integer::New(0)); + obj->Set(String::NewSymbol("bytesParsed"), Integer::New(0, node_isolate)); obj->Set(String::NewSymbol("code"), String::New(http_errno_name(err))); return scope.Close(e); } - return Undefined(); + return Undefined(node_isolate); } static Handle<Value> Reinitialize(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); http_parser_type type = static_cast<http_parser_type>(args[0]->Int32Value()); @@ -491,7 +491,7 @@ public: Parser* parser = ObjectWrap::Unwrap<Parser>(args.This()); parser->Init(type); - return Undefined(); + return Undefined(node_isolate); } @@ -513,7 +513,7 @@ private: // spill headers and request path to JS land void Flush() { - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> cb = handle_->Get(on_headers_sym); @@ -557,7 +557,7 @@ private: void InitHttpParser(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(Parser::New); t->InstanceTemplate()->SetInternalFieldCount(1); @@ -565,10 +565,10 @@ void InitHttpParser(Handle<Object> target) { PropertyAttribute attrib = (PropertyAttribute) (ReadOnly | DontDelete); t->Set(String::NewSymbol("REQUEST"), - Integer::New(HTTP_REQUEST), + Integer::New(HTTP_REQUEST, node_isolate), attrib); t->Set(String::NewSymbol("RESPONSE"), - Integer::New(HTTP_RESPONSE), + Integer::New(HTTP_RESPONSE, node_isolate), attrib); NODE_SET_PROTOTYPE_METHOD(t, "execute", Parser::Execute); diff --git a/src/node_javascript.cc b/src/node_javascript.cc index 49695c0824..5b5a2bea7b 100644 --- a/src/node_javascript.cc +++ b/src/node_javascript.cc @@ -37,7 +37,7 @@ Handle<String> MainSource() { } void DefineJavaScript(v8::Handle<v8::Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); for (int i = 0; natives[i].name; i++) { if (natives[i].source != node_native) { diff --git a/src/node_os.cc b/src/node_os.cc index d9712b8bf4..614a10c96f 100644 --- a/src/node_os.cc +++ b/src/node_os.cc @@ -42,7 +42,7 @@ namespace node { using namespace v8; static Handle<Value> GetEndianness(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int i = 1; bool big = (*(char *)&i) == 0; Local<String> endianness = String::New(big ? "BE" : "LE"); @@ -50,7 +50,7 @@ static Handle<Value> GetEndianness(const Arguments& args) { } static Handle<Value> GetHostname(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); char s[255]; int r = gethostname(s, 255); @@ -66,7 +66,7 @@ static Handle<Value> GetHostname(const Arguments& args) { } static Handle<Value> GetOSType(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); #ifdef __POSIX__ char type[256]; @@ -83,7 +83,7 @@ static Handle<Value> GetOSType(const Arguments& args) { } static Handle<Value> GetOSRelease(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); char release[256]; #ifdef __POSIX__ @@ -98,7 +98,7 @@ static Handle<Value> GetOSRelease(const Arguments& args) { info.dwOSVersionInfoSize = sizeof(info); if (GetVersionEx(&info) == 0) { - return Undefined(); + return Undefined(node_isolate); } sprintf(release, "%d.%d.%d", static_cast<int>(info.dwMajorVersion), @@ -109,14 +109,14 @@ static Handle<Value> GetOSRelease(const Arguments& args) { } static Handle<Value> GetCPUInfo(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); uv_cpu_info_t* cpu_infos; int count, i; uv_err_t err = uv_cpu_info(&cpu_infos, &count); if (err.code != UV_OK) { - return Undefined(); + return Undefined(node_isolate); } Local<Array> cpus = Array::New(); @@ -124,20 +124,20 @@ static Handle<Value> GetCPUInfo(const Arguments& args) { for (i = 0; i < count; i++) { Local<Object> times_info = Object::New(); times_info->Set(String::New("user"), - Integer::New(cpu_infos[i].cpu_times.user)); + Integer::New(cpu_infos[i].cpu_times.user, node_isolate)); times_info->Set(String::New("nice"), - Integer::New(cpu_infos[i].cpu_times.nice)); + Integer::New(cpu_infos[i].cpu_times.nice, node_isolate)); times_info->Set(String::New("sys"), - Integer::New(cpu_infos[i].cpu_times.sys)); + Integer::New(cpu_infos[i].cpu_times.sys, node_isolate)); times_info->Set(String::New("idle"), - Integer::New(cpu_infos[i].cpu_times.idle)); + Integer::New(cpu_infos[i].cpu_times.idle, node_isolate)); times_info->Set(String::New("irq"), - Integer::New(cpu_infos[i].cpu_times.irq)); + Integer::New(cpu_infos[i].cpu_times.irq, node_isolate)); Local<Object> cpu_info = Object::New(); cpu_info->Set(String::New("model"), String::New(cpu_infos[i].model)); cpu_info->Set(String::New("speed"), - Integer::New(cpu_infos[i].speed)); + Integer::New(cpu_infos[i].speed, node_isolate)); cpu_info->Set(String::New("times"), times_info); (*cpus)->Set(i,cpu_info); } @@ -148,42 +148,42 @@ static Handle<Value> GetCPUInfo(const Arguments& args) { } static Handle<Value> GetFreeMemory(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); double amount = uv_get_free_memory(); if (amount < 0) { - return Undefined(); + return Undefined(node_isolate); } return scope.Close(Number::New(amount)); } static Handle<Value> GetTotalMemory(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); double amount = uv_get_total_memory(); if (amount < 0) { - return Undefined(); + return Undefined(node_isolate); } return scope.Close(Number::New(amount)); } static Handle<Value> GetUptime(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); double uptime; uv_err_t err = uv_uptime(&uptime); if (err.code != UV_OK) { - return Undefined(); + return Undefined(node_isolate); } return scope.Close(Number::New(uptime)); } static Handle<Value> GetLoadAvg(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); double loadavg[3]; uv_loadavg(loadavg); @@ -197,7 +197,7 @@ static Handle<Value> GetLoadAvg(const Arguments& args) { static Handle<Value> GetInterfaceAddresses(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); uv_interface_address_t* interfaces; int count, i; char ip[INET6_ADDRSTRLEN]; @@ -238,7 +238,7 @@ static Handle<Value> GetInterfaceAddresses(const Arguments& args) { const bool internal = interfaces[i].is_internal; o->Set(String::New("internal"), - internal ? True() : False()); + internal ? True(node_isolate) : False(node_isolate)); ifarr->Set(ifarr->Length(), o); } @@ -250,7 +250,7 @@ static Handle<Value> GetInterfaceAddresses(const Arguments& args) { void OS::Initialize(v8::Handle<v8::Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); NODE_SET_METHOD(target, "getEndianness", GetEndianness); NODE_SET_METHOD(target, "getHostname", GetHostname); diff --git a/src/node_script.cc b/src/node_script.cc index ca7b9404a7..6f279bc640 100644 --- a/src/node_script.cc +++ b/src/node_script.cc @@ -103,7 +103,7 @@ Persistent<Function> cloneObjectMethod; void CloneObject(Handle<Object> recv, Handle<Value> source, Handle<Value> target) { - HandleScope scope; + HandleScope scope(node_isolate); Handle<Value> args[] = {source, target}; @@ -133,7 +133,7 @@ void CloneObject(Handle<Object> recv, void WrappedContext::Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(WrappedContext::New); constructor_template = Persistent<FunctionTemplate>::New(node_isolate, t); @@ -151,7 +151,7 @@ bool WrappedContext::InstanceOf(Handle<Value> value) { Handle<Value> WrappedContext::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); WrappedContext *t = new WrappedContext(); t->Wrap(args.This()); @@ -185,7 +185,7 @@ Persistent<FunctionTemplate> WrappedScript::constructor_template; void WrappedScript::Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(WrappedScript::New); constructor_template = Persistent<FunctionTemplate>::New(node_isolate, t); @@ -237,7 +237,7 @@ Handle<Value> WrappedScript::New(const Arguments& args) { return FromConstructorTemplate(constructor_template, args); } - HandleScope scope; + HandleScope scope(node_isolate); WrappedScript *t = new WrappedScript(); t->Wrap(args.Holder()); @@ -253,7 +253,7 @@ WrappedScript::~WrappedScript() { Handle<Value> WrappedScript::CreateContext(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Object> context = WrappedContext::NewInstance(); @@ -313,7 +313,7 @@ template <WrappedScript::EvalInputFlags input_flag, WrappedScript::EvalContextFlags context_flag, WrappedScript::EvalOutputFlags output_flag> Handle<Value> WrappedScript::EvalMachine(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (input_flag == compileCode && args.Length() < 1) { return ThrowException(Exception::TypeError( @@ -364,7 +364,7 @@ Handle<Value> 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<Context> tmp = Context::New(); - context = Local<Context>::New(tmp); + context = Local<Context>::New(node_isolate, tmp); tmp.Dispose(node_isolate); } else if (context_flag == userContext) { @@ -427,7 +427,7 @@ Handle<Value> WrappedScript::EvalMachine(const Arguments& args) { return ThrowException(Exception::Error( String::New("Must be called as a method of Script."))); } - n_script->script_ = Persistent<Script>::New(script); + n_script->script_ = Persistent<Script>::New(node_isolate, script); result = args.This(); } @@ -441,7 +441,7 @@ Handle<Value> WrappedScript::EvalMachine(const Arguments& args) { void InitEvals(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); WrappedContext::Initialize(target); WrappedScript::Initialize(target); diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc index 4eaad499de..fb3d0a9ad6 100644 --- a/src/node_stat_watcher.cc +++ b/src/node_stat_watcher.cc @@ -35,7 +35,7 @@ static Persistent<String> onstop_sym; void StatWatcher::Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(StatWatcher::New); constructor_template = Persistent<FunctionTemplate>::New(node_isolate, t); @@ -75,11 +75,11 @@ void StatWatcher::Callback(uv_fs_poll_t* handle, const uv_statbuf_t* curr) { StatWatcher* wrap = static_cast<StatWatcher*>(handle->data); assert(wrap->watcher_ == handle); - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> argv[3]; argv[0] = BuildStatsObject(curr); argv[1] = BuildStatsObject(prev); - argv[2] = Integer::New(status); + argv[2] = Integer::New(status, node_isolate); if (status == -1) { SetErrno(uv_last_error(wrap->watcher_->loop)); } @@ -92,7 +92,7 @@ void StatWatcher::Callback(uv_fs_poll_t* handle, Handle<Value> StatWatcher::New(const Arguments& args) { assert(args.IsConstructCall()); - HandleScope scope; + HandleScope scope(node_isolate); StatWatcher* s = new StatWatcher(); s->Wrap(args.Holder()); return args.This(); @@ -101,7 +101,7 @@ Handle<Value> StatWatcher::New(const Arguments& args) { Handle<Value> StatWatcher::Start(const Arguments& args) { assert(args.Length() == 3); - HandleScope scope; + HandleScope scope(node_isolate); StatWatcher* wrap = ObjectWrap::Unwrap<StatWatcher>(args.Holder()); String::Utf8Value path(args[0]); @@ -112,19 +112,19 @@ Handle<Value> StatWatcher::Start(const Arguments& args) { uv_fs_poll_start(wrap->watcher_, Callback, *path, interval); wrap->Ref(); - return Undefined(); + return Undefined(node_isolate); } Handle<Value> StatWatcher::Stop(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); StatWatcher* wrap = ObjectWrap::Unwrap<StatWatcher>(args.Holder()); if (onstop_sym.IsEmpty()) { onstop_sym = NODE_PSYMBOL("onstop"); } MakeCallback(wrap->handle_, onstop_sym, 0, NULL); wrap->Stop(); - return Undefined(); + return Undefined(node_isolate); } diff --git a/src/node_string.cc b/src/node_string.cc index f8dfbdfa31..8ded75d966 100644 --- a/src/node_string.cc +++ b/src/node_string.cc @@ -25,10 +25,12 @@ namespace node { using namespace v8; +extern Isolate* node_isolate; + Handle<String> ImmutableAsciiSource::CreateFromLiteral( const char *string_literal, size_t length) { - HandleScope scope; + HandleScope scope(node_isolate); Local<String> ret = String::NewExternal(new ImmutableAsciiSource( string_literal, diff --git a/src/node_zlib.cc b/src/node_zlib.cc index d15f371b54..84f1854060 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -105,16 +105,16 @@ class ZCtx : public ObjectWrap { static Handle<Value> Close(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); ZCtx *ctx = ObjectWrap::Unwrap<ZCtx>(args.This()); ctx->Close(); - return scope.Close(Undefined()); + return scope.Close(Undefined(node_isolate)); } // write(flush, in, in_off, in_len, out, out_off, out_len) static Handle<Value> Write(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); assert(args.Length() == 7); ZCtx *ctx = ObjectWrap::Unwrap<ZCtx>(args.This()); @@ -244,7 +244,7 @@ class ZCtx : public ObjectWrap { static void After(uv_work_t* work_req, int status) { assert(status == 0); - HandleScope scope; + HandleScope scope(node_isolate); ZCtx *ctx = container_of(work_req, ZCtx, work_req_); // Acceptable error states depend on the type of zlib stream. @@ -267,8 +267,8 @@ class ZCtx : public ObjectWrap { return; } - Local<Integer> avail_out = Integer::New(ctx->strm_.avail_out); - Local<Integer> avail_in = Integer::New(ctx->strm_.avail_in); + Local<Integer> avail_out = Integer::New(ctx->strm_.avail_out, node_isolate); + Local<Integer> avail_in = Integer::New(ctx->strm_.avail_in, node_isolate); ctx->write_in_progress_ = false; @@ -291,9 +291,10 @@ class ZCtx : public ObjectWrap { assert(ctx->handle_->Get(onerror_sym)->IsFunction() && "Invalid error handler"); - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> args[2] = { String::New(msg), - Local<Value>::New(Number::New(ctx->err_)) }; + Local<Value>::New(node_isolate, + Number::New(ctx->err_)) }; MakeCallback(ctx->handle_, onerror_sym, ARRAY_SIZE(args), args); // no hope of rescue. @@ -302,7 +303,7 @@ class ZCtx : public ObjectWrap { } static Handle<Value> New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); if (args.Length() < 1 || !args[0]->IsInt32()) { return ThrowException(Exception::TypeError(String::New("Bad argument"))); } @@ -319,7 +320,7 @@ class ZCtx : public ObjectWrap { // just pull the ints out of the args and call the other Init static Handle<Value> Init(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); assert((args.Length() == 4 || args.Length() == 5) && "init(windowBits, level, memLevel, strategy, [dictionary])"); @@ -356,17 +357,17 @@ class ZCtx : public ObjectWrap { Init(ctx, level, windowBits, memLevel, strategy, dictionary, dictionary_len); SetDictionary(ctx); - return Undefined(); + return Undefined(node_isolate); } static Handle<Value> Reset(const Arguments &args) { - HandleScope scope; + HandleScope scope(node_isolate); ZCtx *ctx = ObjectWrap::Unwrap<ZCtx>(args.This()); Reset(ctx); SetDictionary(ctx); - return Undefined(); + return Undefined(node_isolate); } static void Init(ZCtx *ctx, int level, int windowBits, int memLevel, @@ -504,7 +505,7 @@ class ZCtx : public ObjectWrap { void InitZlib(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> z = FunctionTemplate::New(ZCtx::New); diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index 6d651b8820..ba71292038 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -60,7 +60,7 @@ uv_pipe_t* PipeWrap::UVHandle() { Local<Object> PipeWrap::Instantiate() { - HandleScope scope; + HandleScope scope(node_isolate); assert(!pipeConstructor.IsEmpty()); return scope.Close(pipeConstructor->NewInstance()); } @@ -76,7 +76,7 @@ PipeWrap* PipeWrap::Unwrap(Local<Object> obj) { void PipeWrap::Initialize(Handle<Object> target) { StreamWrap::Initialize(target); - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); t->SetClassName(String::NewSymbol("Pipe")); @@ -126,7 +126,7 @@ Handle<Value> PipeWrap::New(const Arguments& args) { // normal function. assert(args.IsConstructCall()); - HandleScope scope; + HandleScope scope(node_isolate); PipeWrap* wrap = new PipeWrap(args.This(), args[0]->IsTrue()); assert(wrap); @@ -145,7 +145,7 @@ PipeWrap::PipeWrap(Handle<Object> object, bool ipc) Handle<Value> PipeWrap::Bind(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(PipeWrap) @@ -156,13 +156,13 @@ Handle<Value> PipeWrap::Bind(const Arguments& args) { // Error starting the pipe. if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } #ifdef _WIN32 Handle<Value> PipeWrap::SetPendingInstances(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(PipeWrap) @@ -170,13 +170,13 @@ Handle<Value> PipeWrap::SetPendingInstances(const Arguments& args) { uv_pipe_pending_instances(&wrap->handle_, instances); - return v8::Null(); + return v8::Null(node_isolate); } #endif Handle<Value> PipeWrap::Listen(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(PipeWrap) @@ -187,13 +187,13 @@ Handle<Value> PipeWrap::Listen(const Arguments& args) { // Error starting the pipe. if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } // TODO maybe share with TCPWrap? void PipeWrap::OnConnection(uv_stream_t* handle, int status) { - HandleScope scope; + HandleScope scope(node_isolate); PipeWrap* wrap = static_cast<PipeWrap*>(handle->data); assert(&wrap->handle_ == (uv_pipe_t*)handle); @@ -231,7 +231,7 @@ void PipeWrap::AfterConnect(uv_connect_t* req, int status) { ConnectWrap* req_wrap = (ConnectWrap*) req->data; PipeWrap* wrap = (PipeWrap*) req->handle->data; - HandleScope scope; + HandleScope scope(node_isolate); // The wrap and request objects should still be there. assert(req_wrap->object_.IsEmpty() == false); @@ -248,11 +248,11 @@ void PipeWrap::AfterConnect(uv_connect_t* req, int status) { } Local<Value> argv[5] = { - Integer::New(status), - Local<Value>::New(wrap->object_), - Local<Value>::New(req_wrap->object_), - Local<Value>::New(Boolean::New(readable)), - Local<Value>::New(Boolean::New(writable)) + Integer::New(status, node_isolate), + Local<Value>::New(node_isolate, wrap->object_), + Local<Value>::New(node_isolate, req_wrap->object_), + Local<Value>::New(node_isolate, Boolean::New(readable)), + Local<Value>::New(node_isolate, Boolean::New(writable)) }; if (oncomplete_sym.IsEmpty()) { @@ -265,7 +265,7 @@ void PipeWrap::AfterConnect(uv_connect_t* req, int status) { Handle<Value> PipeWrap::Open(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(PipeWrap) @@ -273,12 +273,12 @@ Handle<Value> PipeWrap::Open(const Arguments& args) { uv_pipe_open(&wrap->handle_, fd); - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } Handle<Value> PipeWrap::Connect(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(PipeWrap) diff --git a/src/process_wrap.cc b/src/process_wrap.cc index 784300f9aa..edc19116a9 100644 --- a/src/process_wrap.cc +++ b/src/process_wrap.cc @@ -54,7 +54,7 @@ static Persistent<String> onexit_sym; class ProcessWrap : public HandleWrap { public: static void Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); HandleWrap::Initialize(target); @@ -80,7 +80,7 @@ class ProcessWrap : public HandleWrap { // normal function. assert(args.IsConstructCall()); - HandleScope scope; + HandleScope scope(node_isolate); ProcessWrap *wrap = new ProcessWrap(args.This()); assert(wrap); @@ -142,7 +142,7 @@ class ProcessWrap : public HandleWrap { } static Handle<Value> Spawn(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(ProcessWrap) @@ -251,7 +251,7 @@ class ProcessWrap : public HandleWrap { wrap->SetHandle((uv_handle_t*)&wrap->process_); assert(wrap->process_.data == wrap); wrap->object_->Set(String::New("pid"), - Integer::New(wrap->process_.pid)); + Integer::New(wrap->process_.pid, node_isolate)); } if (options.args) { @@ -266,11 +266,11 @@ class ProcessWrap : public HandleWrap { delete[] options.stdio; - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } static Handle<Value> Kill(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(ProcessWrap) @@ -280,18 +280,18 @@ class ProcessWrap : public HandleWrap { if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } static void OnExit(uv_process_t* handle, int exit_status, int term_signal) { - HandleScope scope; + HandleScope scope(node_isolate); ProcessWrap* wrap = static_cast<ProcessWrap*>(handle->data); assert(wrap); assert(&wrap->process_ == handle); Local<Value> argv[2] = { - Integer::New(exit_status), + Integer::New(exit_status, node_isolate), String::New(signo_string(term_signal)) }; diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc index 6d93cf0960..6fbe543def 100644 --- a/src/signal_wrap.cc +++ b/src/signal_wrap.cc @@ -45,7 +45,7 @@ static Persistent<String> onsignal_sym; class SignalWrap : public HandleWrap { public: static void Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); HandleWrap::Initialize(target); @@ -71,7 +71,7 @@ class SignalWrap : public HandleWrap { // normal function. assert(args.IsConstructCall()); - HandleScope scope; + HandleScope scope(node_isolate); new SignalWrap(args.This()); return scope.Close(args.This()); @@ -87,7 +87,7 @@ class SignalWrap : public HandleWrap { } static Handle<Value> Start(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(SignalWrap) @@ -97,11 +97,11 @@ class SignalWrap : public HandleWrap { if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } static Handle<Value> Stop(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(SignalWrap) @@ -109,16 +109,16 @@ class SignalWrap : public HandleWrap { if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } static void OnSignal(uv_signal_t* handle, int signum) { - HandleScope scope; + HandleScope scope(node_isolate); SignalWrap* wrap = container_of(handle, SignalWrap, handle_); assert(wrap); - Local<Value> argv[1] = { Integer::New(signum) }; + Local<Value> argv[1] = { Integer::New(signum, node_isolate) }; MakeCallback(wrap->object_, onsignal_sym, ARRAY_SIZE(argv), argv); } diff --git a/src/slab_allocator.cc b/src/slab_allocator.cc index 6af7215302..f51318f5bf 100644 --- a/src/slab_allocator.cc +++ b/src/slab_allocator.cc @@ -59,7 +59,7 @@ SlabAllocator::~SlabAllocator() { void SlabAllocator::Initialize() { - HandleScope scope; + HandleScope scope(node_isolate); char sym[256]; snprintf(sym, sizeof(sym), "slab_%p", this); // namespace object key offset_ = 0; @@ -70,8 +70,8 @@ void SlabAllocator::Initialize() { static Local<Object> NewSlab(unsigned int size) { - HandleScope scope; - Local<Value> arg = Integer::NewFromUnsigned(ROUND_UP(size, 16)); + HandleScope scope(node_isolate); + Local<Value> arg = Integer::NewFromUnsigned(ROUND_UP(size, 16), node_isolate); Local<Object> buf = Buffer::constructor_template ->GetFunction() ->NewInstance(1, &arg); @@ -80,7 +80,7 @@ static Local<Object> NewSlab(unsigned int size) { char* SlabAllocator::Allocate(Handle<Object> obj, unsigned int size) { - HandleScope scope; + HandleScope scope(node_isolate); assert(!obj.IsEmpty()); @@ -112,9 +112,9 @@ char* SlabAllocator::Allocate(Handle<Object> obj, unsigned int size) { Local<Object> SlabAllocator::Shrink(Handle<Object> obj, char* ptr, unsigned int size) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Value> slab_v = obj->GetHiddenValue(slab_sym_); - obj->SetHiddenValue(slab_sym_, Null()); + obj->SetHiddenValue(slab_sym_, Null(node_isolate)); assert(!slab_v.IsEmpty()); assert(slab_v->IsObject()); Local<Object> slab = slab_v->ToObject(); diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index 50497140b0..ade0a79531 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -96,7 +96,7 @@ void StreamWrap::Initialize(Handle<Object> target) { slab_allocator = new SlabAllocator(SLAB_SIZE); AtExit(DeleteSlabAllocator, NULL); - HandleScope scope; + HandleScope scope(node_isolate); HandleWrap::Initialize(target); @@ -119,13 +119,13 @@ StreamWrap::StreamWrap(Handle<Object> object, uv_stream_t* stream) Handle<Value> StreamWrap::GetFD(Local<String>, const AccessorInfo& args) { #if defined(_WIN32) - return v8::Null(); + return v8::Null(node_isolate); #else - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP_NO_ABORT(StreamWrap) int fd = -1; if (wrap != NULL && wrap->stream_ != NULL) fd = wrap->stream_->io_watcher.fd; - return scope.Close(Integer::New(fd)); + return scope.Close(Integer::New(fd, node_isolate)); #endif } @@ -138,14 +138,14 @@ void StreamWrap::SetHandle(uv_handle_t* h) { void StreamWrap::UpdateWriteQueueSize() { - HandleScope scope; + HandleScope scope(node_isolate); object_->Set(write_queue_size_sym, - Integer::New(stream_->write_queue_size)); + Integer::New(stream_->write_queue_size, node_isolate)); } Handle<Value> StreamWrap::ReadStart(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(StreamWrap) @@ -161,12 +161,12 @@ Handle<Value> StreamWrap::ReadStart(const Arguments& args) { // Error starting the tcp. if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } Handle<Value> StreamWrap::ReadStop(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(StreamWrap) @@ -175,7 +175,7 @@ Handle<Value> StreamWrap::ReadStop(const Arguments& args) { // Error starting the tcp. if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } @@ -189,7 +189,7 @@ uv_buf_t StreamWrap::OnAlloc(uv_handle_t* handle, size_t suggested_size) { template <class WrapType, class UVType> static Local<Object> AcceptHandle(uv_stream_t* pipe) { - HandleScope scope; + HandleScope scope(node_isolate); Local<Object> wrap_obj; WrapType* wrap; UVType* handle; @@ -211,7 +211,7 @@ static Local<Object> AcceptHandle(uv_stream_t* pipe) { void StreamWrap::OnReadCommon(uv_stream_t* handle, ssize_t nread, uv_buf_t buf, uv_handle_type pending) { - HandleScope scope; + HandleScope scope(node_isolate); StreamWrap* wrap = static_cast<StreamWrap*>(handle->data); @@ -242,8 +242,8 @@ void StreamWrap::OnReadCommon(uv_stream_t* handle, ssize_t nread, int argc = 3; Local<Value> argv[4] = { slab, - Integer::NewFromUnsigned(buf.base - Buffer::Data(slab)), - Integer::NewFromUnsigned(nread) + Integer::NewFromUnsigned(buf.base - Buffer::Data(slab), node_isolate), + Integer::NewFromUnsigned(nread, node_isolate) }; Local<Object> pending_obj; @@ -284,7 +284,7 @@ void StreamWrap::OnRead2(uv_pipe_t* handle, ssize_t nread, uv_buf_t buf, Handle<Value> StreamWrap::WriteBuffer(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(StreamWrap) @@ -310,7 +310,7 @@ Handle<Value> StreamWrap::WriteBuffer(const Arguments& args) { req_wrap->Dispatched(); req_wrap->object_->Set(bytes_sym, - Integer::NewFromUnsigned(length)); + Integer::NewFromUnsigned(length, node_isolate)); wrap->UpdateWriteQueueSize(); @@ -318,7 +318,7 @@ Handle<Value> StreamWrap::WriteBuffer(const Arguments& args) { SetErrno(uv_last_error(uv_default_loop())); req_wrap->~WriteWrap(); delete[] storage; - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } else { if (wrap->stream_->type == UV_TCP) { NODE_COUNT_NET_BYTES_SENT(length); @@ -333,7 +333,7 @@ Handle<Value> StreamWrap::WriteBuffer(const Arguments& args) { template <WriteEncoding encoding> Handle<Value> StreamWrap::WriteStringImpl(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int r; UNWRAP(StreamWrap) @@ -381,7 +381,7 @@ Handle<Value> StreamWrap::WriteStringImpl(const Arguments& args) { uv_err_t err; err.code = UV_ENOBUFS; SetErrno(err); - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } char* storage = new char[sizeof(WriteWrap) + storage_size + 15]; @@ -465,7 +465,7 @@ Handle<Value> StreamWrap::WriteStringImpl(const Arguments& args) { SetErrno(uv_last_error(uv_default_loop())); req_wrap->~WriteWrap(); delete[] storage; - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } else { if (wrap->stream_->type == UV_TCP) { NODE_COUNT_NET_BYTES_SENT(buf.len); @@ -497,7 +497,7 @@ void StreamWrap::AfterWrite(uv_write_t* req, int status) { WriteWrap* req_wrap = (WriteWrap*) req->data; StreamWrap* wrap = (StreamWrap*) req->handle->data; - HandleScope scope; + HandleScope scope(node_isolate); // The wrap and request objects should still be there. assert(req_wrap->object_.IsEmpty() == false); @@ -515,9 +515,9 @@ void StreamWrap::AfterWrite(uv_write_t* req, int status) { wrap->UpdateWriteQueueSize(); Local<Value> argv[] = { - Integer::New(status), - Local<Value>::New(wrap->object_), - Local<Value>::New(req_wrap->object_) + Integer::New(status, node_isolate), + Local<Value>::New(node_isolate, wrap->object_), + Local<Value>::New(node_isolate, req_wrap->object_) }; MakeCallback(req_wrap->object_, oncomplete_sym, ARRAY_SIZE(argv), argv); @@ -528,7 +528,7 @@ void StreamWrap::AfterWrite(uv_write_t* req, int status) { Handle<Value> StreamWrap::Shutdown(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(StreamWrap) @@ -541,7 +541,7 @@ Handle<Value> StreamWrap::Shutdown(const Arguments& args) { if (r) { SetErrno(uv_last_error(uv_default_loop())); delete req_wrap; - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } else { return scope.Close(req_wrap->object_); } @@ -556,16 +556,16 @@ void StreamWrap::AfterShutdown(uv_shutdown_t* req, int status) { assert(req_wrap->object_.IsEmpty() == false); assert(wrap->object_.IsEmpty() == false); - HandleScope scope; + HandleScope scope(node_isolate); if (status) { SetErrno(uv_last_error(uv_default_loop())); } Local<Value> argv[3] = { - Integer::New(status), - Local<Value>::New(wrap->object_), - Local<Value>::New(req_wrap->object_) + Integer::New(status, node_isolate), + Local<Value>::New(node_isolate, wrap->object_), + Local<Value>::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 34ee8a0638..902d785e61 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -63,7 +63,7 @@ Local<Object> TCPWrap::Instantiate() { // called yet. assert(tcpConstructor.IsEmpty() == false); - HandleScope scope; + HandleScope scope(node_isolate); Local<Object> obj = tcpConstructor->NewInstance(); return scope.Close(obj); @@ -74,7 +74,7 @@ void TCPWrap::Initialize(Handle<Object> target) { HandleWrap::Initialize(target); StreamWrap::Initialize(target); - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); t->SetClassName(String::NewSymbol("TCP")); @@ -145,7 +145,7 @@ Handle<Value> TCPWrap::New(const Arguments& args) { // normal function. assert(args.IsConstructCall()); - HandleScope scope; + HandleScope scope(node_isolate); TCPWrap* wrap = new TCPWrap(args.This()); assert(wrap); @@ -168,7 +168,7 @@ TCPWrap::~TCPWrap() { Handle<Value> TCPWrap::GetSockName(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); struct sockaddr_storage address; UNWRAP(TCPWrap) @@ -180,7 +180,7 @@ Handle<Value> TCPWrap::GetSockName(const Arguments& args) { if (r) { SetErrno(uv_last_error(uv_default_loop())); - return Null(); + return Null(node_isolate); } const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address); @@ -189,7 +189,7 @@ Handle<Value> TCPWrap::GetSockName(const Arguments& args) { Handle<Value> TCPWrap::GetPeerName(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); struct sockaddr_storage address; UNWRAP(TCPWrap) @@ -201,7 +201,7 @@ Handle<Value> TCPWrap::GetPeerName(const Arguments& args) { if (r) { SetErrno(uv_last_error(uv_default_loop())); - return Null(); + return Null(node_isolate); } const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address); @@ -210,7 +210,7 @@ Handle<Value> TCPWrap::GetPeerName(const Arguments& args) { Handle<Value> TCPWrap::SetNoDelay(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TCPWrap) @@ -219,12 +219,12 @@ Handle<Value> TCPWrap::SetNoDelay(const Arguments& args) { if (r) SetErrno(uv_last_error(uv_default_loop())); - return Undefined(); + return Undefined(node_isolate); } Handle<Value> TCPWrap::SetKeepAlive(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TCPWrap) @@ -235,13 +235,13 @@ Handle<Value> TCPWrap::SetKeepAlive(const Arguments& args) { if (r) SetErrno(uv_last_error(uv_default_loop())); - return Undefined(); + return Undefined(node_isolate); } #ifdef _WIN32 Handle<Value> TCPWrap::SetSimultaneousAccepts(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TCPWrap) @@ -251,13 +251,13 @@ Handle<Value> TCPWrap::SetSimultaneousAccepts(const Arguments& args) { if (r) SetErrno(uv_last_error(uv_default_loop())); - return Undefined(); + return Undefined(node_isolate); } #endif Handle<Value> TCPWrap::Bind(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TCPWrap) @@ -270,12 +270,12 @@ Handle<Value> TCPWrap::Bind(const Arguments& args) { // Error starting the tcp. if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } Handle<Value> TCPWrap::Bind6(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TCPWrap) @@ -288,12 +288,12 @@ Handle<Value> TCPWrap::Bind6(const Arguments& args) { // Error starting the tcp. if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } Handle<Value> TCPWrap::Listen(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TCPWrap) @@ -304,12 +304,12 @@ Handle<Value> TCPWrap::Listen(const Arguments& args) { // Error starting the tcp. if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } void TCPWrap::OnConnection(uv_stream_t* handle, int status) { - HandleScope scope; + HandleScope scope(node_isolate); TCPWrap* wrap = static_cast<TCPWrap*>(handle->data); assert(&wrap->handle_ == (uv_tcp_t*)handle); @@ -335,7 +335,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<Value>::New(Null()); + argv[0] = Local<Value>::New(node_isolate, Null(node_isolate)); } MakeCallback(wrap->object_, onconnection_sym, ARRAY_SIZE(argv), argv); @@ -346,7 +346,7 @@ void TCPWrap::AfterConnect(uv_connect_t* req, int status) { ConnectWrap* req_wrap = (ConnectWrap*) req->data; TCPWrap* wrap = (TCPWrap*) req->handle->data; - HandleScope scope; + HandleScope scope(node_isolate); // The wrap and request objects should still be there. assert(req_wrap->object_.IsEmpty() == false); @@ -357,11 +357,11 @@ void TCPWrap::AfterConnect(uv_connect_t* req, int status) { } Local<Value> argv[5] = { - Integer::New(status), - Local<Value>::New(wrap->object_), - Local<Value>::New(req_wrap->object_), - Local<Value>::New(v8::True()), - Local<Value>::New(v8::True()) + Integer::New(status, node_isolate), + Local<Value>::New(node_isolate, wrap->object_), + Local<Value>::New(node_isolate, req_wrap->object_), + Local<Value>::New(node_isolate, v8::True(node_isolate)), + Local<Value>::New(node_isolate, v8::True(node_isolate)) }; MakeCallback(req_wrap->object_, oncomplete_sym, ARRAY_SIZE(argv), argv); @@ -371,7 +371,7 @@ void TCPWrap::AfterConnect(uv_connect_t* req, int status) { Handle<Value> TCPWrap::Connect(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TCPWrap) @@ -393,7 +393,7 @@ Handle<Value> TCPWrap::Connect(const Arguments& args) { if (r) { SetErrno(uv_last_error(uv_default_loop())); delete req_wrap; - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } else { return scope.Close(req_wrap->object_); } @@ -401,7 +401,7 @@ Handle<Value> TCPWrap::Connect(const Arguments& args) { Handle<Value> TCPWrap::Connect6(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TCPWrap) @@ -420,7 +420,7 @@ Handle<Value> TCPWrap::Connect6(const Arguments& args) { if (r) { SetErrno(uv_last_error(uv_default_loop())); delete req_wrap; - return scope.Close(v8::Null()); + return scope.Close(v8::Null(node_isolate)); } else { return scope.Close(req_wrap->object_); } @@ -435,7 +435,7 @@ Local<Object> AddressToJS(const sockaddr* addr) { static Persistent<String> ipv4_sym; static Persistent<String> ipv6_sym; - HandleScope scope; + HandleScope scope(node_isolate); char ip[INET6_ADDRSTRLEN]; const sockaddr_in *a4; const sockaddr_in6 *a6; @@ -458,7 +458,7 @@ Local<Object> AddressToJS(const sockaddr* addr) { port = ntohs(a6->sin6_port); info->Set(address_sym, String::New(ip)); info->Set(family_sym, ipv6_sym); - info->Set(port_sym, Integer::New(port)); + info->Set(port_sym, Integer::New(port, node_isolate)); break; case AF_INET: @@ -467,11 +467,11 @@ Local<Object> AddressToJS(const sockaddr* addr) { port = ntohs(a4->sin_port); info->Set(address_sym, String::New(ip)); info->Set(family_sym, ipv4_sym); - info->Set(port_sym, Integer::New(port)); + info->Set(port_sym, Integer::New(port, node_isolate)); break; default: - info->Set(address_sym, String::Empty()); + info->Set(address_sym, String::Empty(node_isolate)); } return scope.Close(info); diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc index 92964af7a3..88ea6b5e26 100644 --- a/src/timer_wrap.cc +++ b/src/timer_wrap.cc @@ -43,7 +43,7 @@ static Persistent<String> ontimeout_sym; class TimerWrap : public HandleWrap { public: static void Initialize(Handle<Object> target) { - HandleScope scope; + HandleScope scope(node_isolate); HandleWrap::Initialize(target); @@ -73,7 +73,7 @@ class TimerWrap : public HandleWrap { // normal function. assert(args.IsConstructCall()); - HandleScope scope; + HandleScope scope(node_isolate); TimerWrap *wrap = new TimerWrap(args.This()); assert(wrap); @@ -91,7 +91,7 @@ class TimerWrap : public HandleWrap { } static Handle<Value> Start(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TimerWrap) @@ -102,11 +102,11 @@ class TimerWrap : public HandleWrap { if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } static Handle<Value> Stop(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TimerWrap) @@ -114,11 +114,11 @@ class TimerWrap : public HandleWrap { if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } static Handle<Value> Again(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TimerWrap) @@ -126,11 +126,11 @@ class TimerWrap : public HandleWrap { if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } static Handle<Value> SetRepeat(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TimerWrap) @@ -138,11 +138,11 @@ class TimerWrap : public HandleWrap { uv_timer_set_repeat(&wrap->handle_, repeat); - return scope.Close(Integer::New(0)); + return scope.Close(Integer::New(0, node_isolate)); } static Handle<Value> GetRepeat(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TimerWrap) @@ -150,16 +150,16 @@ class TimerWrap : public HandleWrap { if (repeat < 0) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(repeat)); + return scope.Close(Integer::New(repeat, node_isolate)); } static void OnTimeout(uv_timer_t* handle, int status) { - HandleScope scope; + HandleScope scope(node_isolate); TimerWrap* wrap = static_cast<TimerWrap*>(handle->data); assert(wrap); - Local<Value> argv[1] = { Integer::New(status) }; + Local<Value> argv[1] = { Integer::New(status, node_isolate) }; MakeCallback(wrap->object_, ontimeout_sym, ARRAY_SIZE(argv), argv); } diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc index 5ad6106c09..080e53b446 100644 --- a/src/tty_wrap.cc +++ b/src/tty_wrap.cc @@ -48,7 +48,7 @@ using v8::Value; void TTYWrap::Initialize(Handle<Object> target) { StreamWrap::Initialize(target); - HandleScope scope; + HandleScope scope(node_isolate); Local<FunctionTemplate> t = FunctionTemplate::New(New); t->SetClassName(String::NewSymbol("TTY")); @@ -98,7 +98,7 @@ uv_tty_t* TTYWrap::UVHandle() { Handle<Value> TTYWrap::GuessHandleType(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int fd = args[0]->Int32Value(); assert(fd >= 0); @@ -119,26 +119,26 @@ Handle<Value> TTYWrap::GuessHandleType(const Arguments& args) { default: assert(0); - return v8::Undefined(); + return v8::Undefined(node_isolate); } } Handle<Value> TTYWrap::IsTTY(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); int fd = args[0]->Int32Value(); assert(fd >= 0); if (uv_guess_handle(fd) == UV_TTY) { - return v8::True(); + return v8::True(node_isolate); } - return v8::False(); + return v8::False(node_isolate); } Handle<Value> TTYWrap::GetWindowSize(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TTYWrap) @@ -147,19 +147,19 @@ Handle<Value> TTYWrap::GetWindowSize(const Arguments& args) { if (r) { SetErrno(uv_last_error(uv_default_loop())); - return v8::Undefined(); + return v8::Undefined(node_isolate); } Local<v8::Array> a = v8::Array::New(2); - a->Set(0, Integer::New(width)); - a->Set(1, Integer::New(height)); + a->Set(0, Integer::New(width, node_isolate)); + a->Set(1, Integer::New(height, node_isolate)); return scope.Close(a); } Handle<Value> TTYWrap::SetRawMode(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(TTYWrap) @@ -169,12 +169,12 @@ Handle<Value> TTYWrap::SetRawMode(const Arguments& args) { SetErrno(uv_last_error(uv_default_loop())); } - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } Handle<Value> TTYWrap::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); // This constructor should not be exposed to public javascript. // Therefore we assert that we are not trying to call this as a diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc index d3e49e0e2e..31cadb5e76 100644 --- a/src/udp_wrap.cc +++ b/src/udp_wrap.cc @@ -35,19 +35,16 @@ namespace node { using v8::AccessorInfo; using v8::Arguments; -using v8::False; using v8::Function; using v8::FunctionTemplate; using v8::Handle; using v8::HandleScope; using v8::Integer; using v8::Local; -using v8::Null; using v8::Object; using v8::Persistent; using v8::PropertyAttribute; using v8::String; -using v8::True; using v8::Value; typedef ReqWrap<uv_udp_send_t> SendWrap; @@ -86,7 +83,7 @@ void UDPWrap::Initialize(Handle<Object> target) { slab_allocator = new SlabAllocator(SLAB_SIZE); AtExit(DeleteSlabAllocator, NULL); - HandleScope scope; + HandleScope scope(node_isolate); buffer_sym = NODE_PSYMBOL("buffer"); oncomplete_sym = NODE_PSYMBOL("oncomplete"); @@ -130,7 +127,7 @@ void UDPWrap::Initialize(Handle<Object> target) { Handle<Value> UDPWrap::New(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); assert(args.IsConstructCall()); new UDPWrap(args.This()); @@ -141,18 +138,18 @@ Handle<Value> UDPWrap::New(const Arguments& args) { Handle<Value> UDPWrap::GetFD(Local<String>, const AccessorInfo& args) { #if defined(_WIN32) - return v8::Null(); + return v8::Null(node_isolate); #else - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(UDPWrap) int fd = (wrap == NULL) ? -1 : wrap->handle_.io_watcher.fd; - return scope.Close(Integer::New(fd)); + return scope.Close(Integer::New(fd, node_isolate)); #endif } Handle<Value> UDPWrap::DoBind(const Arguments& args, int family) { - HandleScope scope; + HandleScope scope(node_isolate); int r; UNWRAP(UDPWrap) @@ -179,7 +176,7 @@ Handle<Value> UDPWrap::DoBind(const Arguments& args, int family) { if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } @@ -195,13 +192,13 @@ Handle<Value> UDPWrap::Bind6(const Arguments& args) { #define X(name, fn) \ Handle<Value> UDPWrap::name(const Arguments& args) { \ - HandleScope scope; \ + HandleScope scope(node_isolate); \ UNWRAP(UDPWrap) \ assert(args.Length() == 1); \ int flag = args[0]->Int32Value(); \ int r = fn(&wrap->handle_, flag); \ if (r) SetErrno(uv_last_error(uv_default_loop())); \ - return scope.Close(Integer::New(r)); \ + return scope.Close(Integer::New(r, node_isolate)); \ } X(SetTTL, uv_udp_set_ttl) @@ -214,7 +211,7 @@ X(SetMulticastLoopback, uv_udp_set_multicast_loop) Handle<Value> UDPWrap::SetMembership(const Arguments& args, uv_membership membership) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(UDPWrap) assert(args.Length() == 2); @@ -233,7 +230,7 @@ Handle<Value> UDPWrap::SetMembership(const Arguments& args, if (r) SetErrno(uv_last_error(uv_default_loop())); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } @@ -248,7 +245,7 @@ Handle<Value> UDPWrap::DropMembership(const Arguments& args) { Handle<Value> UDPWrap::DoSend(const Arguments& args, int family) { - HandleScope scope; + HandleScope scope(node_isolate); int r; // send(buffer, offset, length, port, address) @@ -292,7 +289,7 @@ Handle<Value> UDPWrap::DoSend(const Arguments& args, int family) { if (r) { SetErrno(uv_last_error(uv_default_loop())); delete req_wrap; - return Null(); + return Null(node_isolate); } else { return scope.Close(req_wrap->object_); @@ -311,7 +308,7 @@ Handle<Value> UDPWrap::Send6(const Arguments& args) { Handle<Value> UDPWrap::RecvStart(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(UDPWrap) @@ -319,26 +316,26 @@ Handle<Value> UDPWrap::RecvStart(const Arguments& args) { int r = uv_udp_recv_start(&wrap->handle_, OnAlloc, OnRecv); if (r && uv_last_error(uv_default_loop()).code != UV_EALREADY) { SetErrno(uv_last_error(uv_default_loop())); - return False(); + return False(node_isolate); } - return True(); + return True(node_isolate); } Handle<Value> UDPWrap::RecvStop(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); UNWRAP(UDPWrap) int r = uv_udp_recv_stop(&wrap->handle_); - return scope.Close(Integer::New(r)); + return scope.Close(Integer::New(r, node_isolate)); } Handle<Value> UDPWrap::GetSockName(const Arguments& args) { - HandleScope scope; + HandleScope scope(node_isolate); struct sockaddr_storage address; UNWRAP(UDPWrap) @@ -350,7 +347,7 @@ Handle<Value> UDPWrap::GetSockName(const Arguments& args) { if (r) { SetErrno(uv_last_error(uv_default_loop())); - return Null(); + return Null(node_isolate); } const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address); @@ -360,7 +357,7 @@ Handle<Value> UDPWrap::GetSockName(const Arguments& args) { // TODO share with StreamWrap::AfterWrite() in stream_wrap.cc void UDPWrap::OnSend(uv_udp_send_t* req, int status) { - HandleScope scope; + HandleScope scope(node_isolate); assert(req != NULL); @@ -375,9 +372,9 @@ void UDPWrap::OnSend(uv_udp_send_t* req, int status) { } Local<Value> argv[4] = { - Integer::New(status), - Local<Value>::New(wrap->object_), - Local<Value>::New(req_wrap->object_), + Integer::New(status, node_isolate), + Local<Value>::New(node_isolate, wrap->object_), + Local<Value>::New(node_isolate, req_wrap->object_), req_wrap->object_->GetHiddenValue(buffer_sym), }; @@ -398,7 +395,7 @@ void UDPWrap::OnRecv(uv_udp_t* handle, uv_buf_t buf, struct sockaddr* addr, unsigned flags) { - HandleScope scope; + HandleScope scope(node_isolate); UDPWrap* wrap = reinterpret_cast<UDPWrap*>(handle->data); Local<Object> slab = slab_allocator->Shrink(wrap->object_, @@ -407,17 +404,17 @@ void UDPWrap::OnRecv(uv_udp_t* handle, if (nread == 0) return; if (nread < 0) { - Local<Value> argv[] = { Local<Object>::New(wrap->object_) }; + Local<Value> argv[] = { Local<Object>::New(node_isolate, wrap->object_) }; SetErrno(uv_last_error(uv_default_loop())); MakeCallback(wrap->object_, onmessage_sym, ARRAY_SIZE(argv), argv); return; } Local<Value> argv[] = { - Local<Object>::New(wrap->object_), + Local<Object>::New(node_isolate, wrap->object_), slab, - Integer::NewFromUnsigned(buf.base - Buffer::Data(slab)), - Integer::NewFromUnsigned(nread), + Integer::NewFromUnsigned(buf.base - Buffer::Data(slab), node_isolate), + Integer::NewFromUnsigned(nread, node_isolate), AddressToJS(addr) }; MakeCallback(wrap->object_, onmessage_sym, ARRAY_SIZE(argv), argv); @@ -435,7 +432,7 @@ Local<Object> UDPWrap::Instantiate() { // If this assert fires then Initialize hasn't been called yet. assert(constructor.IsEmpty() == false); - HandleScope scope; + HandleScope scope(node_isolate); Local<Object> obj = constructor->NewInstance(); return scope.Close(obj); diff --git a/src/v8_typed_array.cc b/src/v8_typed_array.cc index 3eaf19dca8..66f36ff76b 100644 --- a/src/v8_typed_array.cc +++ b/src/v8_typed_array.cc @@ -47,7 +47,7 @@ class ArrayBuffer { if (!ft_cache.IsEmpty()) return ft_cache; - v8::HandleScope scope; + v8::HandleScope scope(node::node_isolate); ft_cache = v8::Persistent<v8::FunctionTemplate>::New(node::node_isolate, v8::FunctionTemplate::New(&ArrayBuffer::V8New)); ft_cache->SetClassName(v8::String::New("ArrayBuffer")); @@ -113,7 +113,8 @@ class ArrayBuffer { args.This()->SetAlignedPointerInInternalField(0, buf); args.This()->Set(v8::String::New("byteLength"), - v8::Integer::NewFromUnsigned(num_bytes), + v8::Integer::NewFromUnsigned(num_bytes, + node::node_isolate), (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete)); // NOTE(deanm): This is not in the spec, you shouldn't be able to index @@ -155,11 +156,12 @@ class ArrayBuffer { unsigned int slice_length = end - begin; v8::Local<v8::Value> argv[] = { - v8::Integer::New(slice_length)}; + v8::Integer::New(slice_length, node::node_isolate)}; v8::Local<v8::Object> buffer = ArrayBuffer::GetTemplate()-> GetFunction()->NewInstance(1, argv); - if (buffer.IsEmpty()) return v8::Undefined(); // constructor failed + // constructor failed + if (buffer.IsEmpty()) return v8::Undefined(node::node_isolate); void* src = args.This()->GetAlignedPointerFromInternalField(0); void* dest = buffer->GetAlignedPointerFromInternalField(0); @@ -205,7 +207,7 @@ class TypedArray { if (!ft_cache.IsEmpty()) return ft_cache; - v8::HandleScope scope; + v8::HandleScope scope(node::node_isolate); ft_cache = v8::Persistent<v8::FunctionTemplate>::New(node::node_isolate, v8::FunctionTemplate::New(&TypedArray<TBytes, TEAType>::V8New)); ft_cache->SetClassName(v8::String::New(TEANameTrait<TEAType>::name)); @@ -213,9 +215,9 @@ class TypedArray { instance->SetInternalFieldCount(0); ft_cache->Set(v8::String::New("BYTES_PER_ELEMENT"), - v8::Uint32::New(TBytes), v8::ReadOnly); + v8::Uint32::New(TBytes, node::node_isolate), v8::ReadOnly); instance->Set(v8::String::New("BYTES_PER_ELEMENT"), - v8::Uint32::New(TBytes), v8::ReadOnly); + v8::Uint32::New(TBytes, node::node_isolate), v8::ReadOnly); v8::Local<v8::Signature> default_signature = v8::Signature::New(ft_cache); @@ -295,10 +297,11 @@ class TypedArray { // TODO(deanm): Handle integer overflow. v8::Local<v8::Value> argv[1] = { - v8::Integer::NewFromUnsigned(length * TBytes)}; + v8::Integer::NewFromUnsigned(length * TBytes, node::node_isolate)}; buffer = ArrayBuffer::GetTemplate()-> GetFunction()->NewInstance(1, argv); - if (buffer.IsEmpty()) return v8::Undefined(); // constructor failed + // constructor failed + if (buffer.IsEmpty()) return v8::Undefined(node::node_isolate); void* buf = buffer->GetAlignedPointerFromInternalField(0); args.This()->SetIndexedPropertiesToExternalArrayData( @@ -323,11 +326,12 @@ class TypedArray { length = args[0]->Uint32Value(); // TODO(deanm): Handle integer overflow. v8::Local<v8::Value> argv[1] = { - v8::Integer::NewFromUnsigned(length * TBytes)}; + v8::Integer::NewFromUnsigned(length * TBytes, node::node_isolate)}; buffer = ArrayBuffer::GetTemplate()-> GetFunction()->NewInstance(1, argv); - if (buffer.IsEmpty()) return v8::Undefined(); // constructor failed + // constructor failed + if (buffer.IsEmpty()) return v8::Undefined(node::node_isolate); void* buf = buffer->GetAlignedPointerFromInternalField(0); args.This()->SetIndexedPropertiesToExternalArrayData( @@ -339,13 +343,15 @@ class TypedArray { buffer, (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete)); args.This()->Set(v8::String::New("length"), - v8::Integer::NewFromUnsigned(length), + v8::Integer::NewFromUnsigned(length, node::node_isolate), (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete)); args.This()->Set(v8::String::New("byteOffset"), - v8::Integer::NewFromUnsigned(byte_offset), + v8::Integer::NewFromUnsigned(byte_offset, + node::node_isolate), (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete)); args.This()->Set(v8::String::New("byteLength"), - v8::Integer::NewFromUnsigned(length * TBytes), + v8::Integer::NewFromUnsigned(length * TBytes, + node::node_isolate), (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete)); return args.This(); @@ -358,7 +364,7 @@ class TypedArray { if (args[0]->IsNumber()) return args.This()->Get(args[0]->Uint32Value()); - return v8::Undefined(); + return v8::Undefined(node::node_isolate); } static v8::Handle<v8::Value> set(const v8::Arguments& args) { @@ -425,7 +431,7 @@ class TypedArray { } } - return v8::Undefined(); + return v8::Undefined(node::node_isolate); } static v8::Handle<v8::Value> subarray(const v8::Arguments& args) { @@ -454,8 +460,8 @@ class TypedArray { // Call through to the ArrayBuffer, byteOffset, length constructor. v8::Local<v8::Value> argv[] = { args.This()->Get(v8::String::New("buffer")), - v8::Integer::New(byte_offset), - v8::Integer::New(end - begin)}; + v8::Integer::New(byte_offset, node::node_isolate), + v8::Integer::New(end - begin, node::node_isolate)}; return TypedArray<TBytes, TEAType>::GetTemplate()-> GetFunction()->NewInstance(3, argv); } @@ -473,37 +479,37 @@ class Float64Array : public TypedArray<8, v8::kExternalDoubleArray> { }; template <typename T> v8::Handle<v8::Value> cTypeToValue(T) { - return v8::Undefined(); + return v8::Undefined(node::node_isolate); } template <> v8::Handle<v8::Value> cTypeToValue(unsigned char val) { - return v8::Integer::NewFromUnsigned(val); + return v8::Integer::NewFromUnsigned(val, node::node_isolate); } template <> v8::Handle<v8::Value> cTypeToValue(signed char val) { - return v8::Integer::New(val); + return v8::Integer::New(val, node::node_isolate); } template <> v8::Handle<v8::Value> cTypeToValue(unsigned short val) { - return v8::Integer::NewFromUnsigned(val); + return v8::Integer::NewFromUnsigned(val, node::node_isolate); } template <> v8::Handle<v8::Value> cTypeToValue(short val) { - return v8::Integer::New(val); + return v8::Integer::New(val, node::node_isolate); } template <> v8::Handle<v8::Value> cTypeToValue(unsigned int val) { - return v8::Integer::NewFromUnsigned(val); + return v8::Integer::NewFromUnsigned(val, node::node_isolate); } template <> v8::Handle<v8::Value> cTypeToValue(int val) { - return v8::Integer::New(val); + return v8::Integer::New(val, node::node_isolate); } template <> @@ -570,7 +576,7 @@ class DataView { if (!ft_cache.IsEmpty()) return ft_cache; - v8::HandleScope scope; + v8::HandleScope scope(node::node_isolate); ft_cache = v8::Persistent<v8::FunctionTemplate>::New(node::node_isolate, v8::FunctionTemplate::New(&DataView::V8New)); ft_cache->SetClassName(v8::String::New("DataView")); @@ -659,10 +665,12 @@ class DataView { buffer, (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete)); args.This()->Set(v8::String::New("byteOffset"), - v8::Integer::NewFromUnsigned(byte_offset), + v8::Integer::NewFromUnsigned(byte_offset, + node::node_isolate), (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete)); args.This()->Set(v8::String::New("byteLength"), - v8::Integer::NewFromUnsigned(byte_length), + v8::Integer::NewFromUnsigned(byte_length, + node::node_isolate), (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete)); return args.This(); } @@ -740,7 +748,7 @@ class DataView { } else { memcpy(ptr, &val, sizeof(T)); } - return v8::Undefined(); + return v8::Undefined(node::node_isolate); } static v8::Handle<v8::Value> getUint8(const v8::Arguments& args) { @@ -814,7 +822,7 @@ class DataView { namespace v8_typed_array { void AttachBindings(v8::Handle<v8::Object> obj) { - v8::HandleScope scope; + v8::HandleScope scope(node::node_isolate); obj->Set(v8::String::New("ArrayBuffer"), ArrayBuffer::GetTemplate()->GetFunction()); |