Skip to content

Commit 6573fc3

Browse files
bnoordhuisbnoordhuis
committed
src: pass node_isolate to Integer::New
1 parent 412b3ce commit 6573fc3

20 files changed

+183
-159
lines changed

‎src/cares_wrap.cc‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static Local<Array> HostentToAddresses(struct hostent* host) {
203203
uv_inet_ntop(host->h_addrtype, host->h_addr_list[i], ip, sizeof(ip));
204204

205205
Local<String> address = String::New(ip);
206-
addresses->Set(Integer::New(i), address);
206+
addresses->Set(Integer::New(i, node_isolate), address);
207207
}
208208

209209
return scope.Close(addresses);
@@ -216,7 +216,7 @@ static Local<Array> HostentToNames(struct hostent* host) {
216216

217217
for (int i = 0; host->h_aliases[i]; ++i) {
218218
Local<String> address = String::New(host->h_aliases[i]);
219-
names->Set(Integer::New(i), address);
219+
names->Set(Integer::New(i, node_isolate), address);
220220
}
221221

222222
return scope.Close(names);
@@ -337,13 +337,13 @@ class QueryWrap {
337337

338338
void CallOnComplete(Local<Value> answer) {
339339
HandleScope scope;
340-
Local<Value> argv[2] = { Integer::New(0), answer };
340+
Local<Value> argv[2] = { Integer::New(0, node_isolate), answer };
341341
MakeCallback(object_, oncomplete_sym, ARRAY_SIZE(argv), argv);
342342
}
343343

344344
void CallOnComplete(Local<Value> answer, Local<Value> family) {
345345
HandleScope scope;
346-
Local<Value> argv[3] = { Integer::New(0), answer, family };
346+
Local<Value> argv[3] = { Integer::New(0, node_isolate), answer, family };
347347
MakeCallback(object_, oncomplete_sym, ARRAY_SIZE(argv), argv);
348348
}
349349

@@ -352,7 +352,7 @@ class QueryWrap {
352352
SetAresErrno(status);
353353

354354
HandleScope scope;
355-
Local<Value> argv[1] = { Integer::New(-1) };
355+
Local<Value> argv[1] = { Integer::New(-1, node_isolate) };
356356
MakeCallback(object_, oncomplete_sym, ARRAY_SIZE(argv), argv);
357357
}
358358

@@ -491,8 +491,9 @@ class QueryMxWrap: public QueryWrap {
491491
mx_current = mx_current->next) {
492492
Local<Object> mx_record = Object::New();
493493
mx_record->Set(exchange_symbol, String::New(mx_current->host));
494-
mx_record->Set(priority_symbol, Integer::New(mx_current->priority));
495-
mx_records->Set(Integer::New(i++), mx_record);
494+
mx_record->Set(priority_symbol,
495+
Integer::New(mx_current->priority, node_isolate));
496+
mx_records->Set(Integer::New(i++, node_isolate), mx_record);
496497
}
497498

498499
ares_free_data(mx_start);
@@ -549,7 +550,7 @@ class QueryTxtWrap: public QueryWrap {
549550
struct ares_txt_reply *current = txt_out;
550551
for (int i = 0; current; ++i, current = current->next) {
551552
Local<String> txt = String::New(reinterpret_cast<char*>(current->txt));
552-
txt_records->Set(Integer::New(i), txt);
553+
txt_records->Set(Integer::New(i, node_isolate), txt);
553554
}
554555

555556
ares_free_data(txt_out);
@@ -593,10 +594,13 @@ class QuerySrvWrap: public QueryWrap {
593594
srv_current = srv_current->next) {
594595
Local<Object> srv_record = Object::New();
595596
srv_record->Set(name_symbol, String::New(srv_current->host));
596-
srv_record->Set(port_symbol, Integer::New(srv_current->port));
597-
srv_record->Set(priority_symbol, Integer::New(srv_current->priority));
598-
srv_record->Set(weight_symbol, Integer::New(srv_current->weight));
599-
srv_records->Set(Integer::New(i++), srv_record);
597+
srv_record->Set(port_symbol,
598+
Integer::New(srv_current->port, node_isolate));
599+
srv_record->Set(priority_symbol,
600+
Integer::New(srv_current->priority, node_isolate));
601+
srv_record->Set(weight_symbol,
602+
Integer::New(srv_current->weight, node_isolate));
603+
srv_records->Set(Integer::New(i++, node_isolate), srv_record);
600604
}
601605

602606
ares_free_data(srv_start);
@@ -652,7 +656,7 @@ class GetHostByNameWrap: public QueryWrap {
652656
HandleScope scope;
653657

654658
Local<Array> addresses = HostentToAddresses(host);
655-
Local<Integer> family = Integer::New(host->h_addrtype);
659+
Local<Integer> family = Integer::New(host->h_addrtype, node_isolate);
656660

657661
this->CallOnComplete(addresses, family);
658662
}
@@ -820,14 +824,14 @@ static Handle<Value> IsIP(const Arguments& args) {
820824
char address_buffer[sizeof(struct in6_addr)];
821825

822826
if (uv_inet_pton(AF_INET, *ip, &address_buffer).code == UV_OK) {
823-
return scope.Close(v8::Integer::New(4));
827+
return scope.Close(v8::Integer::New(4, node_isolate));
824828
}
825829

826830
if (uv_inet_pton(AF_INET6, *ip, &address_buffer).code == UV_OK) {
827-
return scope.Close(v8::Integer::New(6));
831+
return scope.Close(v8::Integer::New(6, node_isolate));
828832
}
829833

830-
return scope.Close(v8::Integer::New(0));
834+
return scope.Close(v8::Integer::New(0, node_isolate));
831835
}
832836

833837

@@ -906,9 +910,12 @@ static void Initialize(Handle<Object> target) {
906910
NODE_SET_METHOD(target, "getaddrinfo", GetAddrInfo);
907911
NODE_SET_METHOD(target, "isIP", IsIP);
908912

909-
target->Set(String::NewSymbol("AF_INET"), Integer::New(AF_INET));
910-
target->Set(String::NewSymbol("AF_INET6"), Integer::New(AF_INET6));
911-
target->Set(String::NewSymbol("AF_UNSPEC"), Integer::New(AF_UNSPEC));
913+
target->Set(String::NewSymbol("AF_INET"),
914+
Integer::New(AF_INET, node_isolate));
915+
target->Set(String::NewSymbol("AF_INET6"),
916+
Integer::New(AF_INET6, node_isolate));
917+
target->Set(String::NewSymbol("AF_UNSPEC"),
918+
Integer::New(AF_UNSPEC, node_isolate));
912919

913920
oncomplete_sym = NODE_PSYMBOL("oncomplete");
914921
}

‎src/fs_event_wrap.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Handle<Value> FSEventWrap::Start(const Arguments& args) {
110110
SetErrno(uv_last_error(uv_default_loop()));
111111
}
112112

113-
return scope.Close(Integer::New(r));
113+
return scope.Close(Integer::New(r, node_isolate));
114114
}
115115

116116

@@ -150,7 +150,7 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename,
150150
}
151151

152152
Local<Value> argv[3] = {
153-
Integer::New(status),
153+
Integer::New(status, node_isolate),
154154
eventStr,
155155
filename ? (Local<Value>)String::New(filename) : Local<Value>::New(v8::Null())
156156
};

‎src/node.cc‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ Local<Value> ErrnoException(int errorno,
720720

721721
Local<Object> obj = e->ToObject();
722722

723-
obj->Set(errno_symbol, Integer::New(errorno));
723+
obj->Set(errno_symbol, Integer::New(errorno, node_isolate));
724724
obj->Set(code_symbol, estring);
725725
if (path) obj->Set(errpath_symbol, String::New(path));
726726
if (syscall) obj->Set(syscall_symbol, String::NewSymbol(syscall));
@@ -792,7 +792,7 @@ Local<Value> UVException(int errorno,
792792
Local<Object> obj = e->ToObject();
793793

794794
// TODO errno should probably go
795-
obj->Set(errno_symbol, Integer::New(errorno));
795+
obj->Set(errno_symbol, Integer::New(errorno, node_isolate));
796796
obj->Set(code_symbol, estring);
797797
if (path) obj->Set(errpath_symbol, path_str);
798798
if (syscall) obj->Set(syscall_symbol, String::NewSymbol(syscall));
@@ -853,7 +853,7 @@ Local<Value> WinapiErrnoException(int errorno,
853853

854854
Local<Object> obj = e->ToObject();
855855

856-
obj->Set(errno_symbol, Integer::New(errorno));
856+
obj->Set(errno_symbol, Integer::New(errorno, node_isolate));
857857
if (path) obj->Set(errpath_symbol, String::New(path));
858858
if (syscall) obj->Set(syscall_symbol, String::NewSymbol(syscall));
859859
return e;
@@ -944,7 +944,7 @@ MakeCallback(const Handle<Object> object,
944944

945945
Local<Array> argArray = Array::New(argc);
946946
for (int i = 0; i < argc; i++) {
947-
argArray->Set(Integer::New(i), argv[i]);
947+
argArray->Set(Integer::New(i, node_isolate), argv[i]);
948948
}
949949

950950
Local<Value> object_l = Local<Value>::New(object);
@@ -1501,14 +1501,14 @@ static gid_t gid_by_name(Handle<Value> value) {
15011501
static Handle<Value> GetUid(const Arguments& args) {
15021502
HandleScope scope;
15031503
int uid = getuid();
1504-
return scope.Close(Integer::New(uid));
1504+
return scope.Close(Integer::New(uid, node_isolate));
15051505
}
15061506

15071507

15081508
static Handle<Value> GetGid(const Arguments& args) {
15091509
HandleScope scope;
15101510
int gid = getgid();
1511-
return scope.Close(Integer::New(gid));
1511+
return scope.Close(Integer::New(gid, node_isolate));
15121512
}
15131513

15141514

@@ -1577,14 +1577,14 @@ static Handle<Value> GetGroups(const Arguments& args) {
15771577
gid_t egid = getegid();
15781578

15791579
for (int i = 0; i < ngroups; i++) {
1580-
groups_list->Set(i, Integer::New(groups[i]));
1580+
groups_list->Set(i, Integer::New(groups[i], node_isolate));
15811581
if (groups[i] == egid) seen_egid = true;
15821582
}
15831583

15841584
delete[] groups;
15851585

15861586
if (seen_egid == false) {
1587-
groups_list->Set(ngroups, Integer::New(egid));
1587+
groups_list->Set(ngroups, Integer::New(egid, node_isolate));
15881588
}
15891589

15901590
return scope.Close(groups_list);
@@ -1721,9 +1721,11 @@ v8::Handle<v8::Value> MemoryUsage(const v8::Arguments& args) {
17211721
HeapStatistics v8_heap_stats;
17221722
V8::GetHeapStatistics(&v8_heap_stats);
17231723
info->Set(heap_total_symbol,
1724-
Integer::NewFromUnsigned(v8_heap_stats.total_heap_size()));
1724+
Integer::NewFromUnsigned(v8_heap_stats.total_heap_size(),
1725+
node_isolate));
17251726
info->Set(heap_used_symbol,
1726-
Integer::NewFromUnsigned(v8_heap_stats.used_heap_size()));
1727+
Integer::NewFromUnsigned(v8_heap_stats.used_heap_size(),
1728+
node_isolate));
17271729

17281730
return scope.Close(info);
17291731
}
@@ -1742,7 +1744,7 @@ Handle<Value> Kill(const Arguments& args) {
17421744

17431745
if (err.code != UV_OK) {
17441746
SetErrno(err);
1745-
return scope.Close(Integer::New(-1));
1747+
return scope.Close(Integer::New(-1, node_isolate));
17461748
}
17471749

17481750
return Undefined();
@@ -1775,8 +1777,8 @@ Handle<Value> Hrtime(const v8::Arguments& args) {
17751777
}
17761778

17771779
Local<Array> tuple = Array::New(2);
1778-
tuple->Set(0, Integer::NewFromUnsigned(t / NANOS_PER_SEC));
1779-
tuple->Set(1, Integer::NewFromUnsigned(t % NANOS_PER_SEC));
1780+
tuple->Set(0, Integer::NewFromUnsigned(t / NANOS_PER_SEC, node_isolate));
1781+
tuple->Set(1, Integer::NewFromUnsigned(t % NANOS_PER_SEC, node_isolate));
17801782

17811783
return scope.Close(tuple);
17821784
}
@@ -2048,7 +2050,7 @@ static Handle<Integer> EnvQuery(Local<String> property,
20482050
#ifdef __POSIX__
20492051
String::Utf8Value key(property);
20502052
if (getenv(*key)) {
2051-
return scope.Close(Integer::New(None));
2053+
return scope.Close(Integer::New(0, node_isolate));
20522054
}
20532055
#else // _WIN32
20542056
String::Value key(property);
@@ -2059,9 +2061,10 @@ static Handle<Integer> EnvQuery(Local<String> property,
20592061
// Environment variables that start with '=' are hidden and read-only.
20602062
return scope.Close(Integer::New(v8::ReadOnly ||
20612063
v8::DontDelete ||
2062-
v8::DontEnum));
2064+
v8::DontEnum,
2065+
node_isolate));
20632066
} else {
2064-
return scope.Close(Integer::New(None));
2067+
return scope.Close(Integer::New(0, node_isolate));
20652068
}
20662069
}
20672070
#endif
@@ -2163,7 +2166,7 @@ static Handle<Object> GetFeatures() {
21632166
static Handle<Value> DebugPortGetter(Local<String> property,
21642167
const AccessorInfo& info) {
21652168
HandleScope scope;
2166-
return scope.Close(Integer::NewFromUnsigned(debug_port));
2169+
return scope.Close(Integer::NewFromUnsigned(debug_port, node_isolate));
21672170
}
21682171

21692172

@@ -2242,18 +2245,18 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) {
22422245

22432246
// process.argv
22442247
Local<Array> arguments = Array::New(argc - option_end_index + 1);
2245-
arguments->Set(Integer::New(0), String::New(argv[0]));
2248+
arguments->Set(Integer::New(0, node_isolate), String::New(argv[0]));
22462249
for (j = 1, i = option_end_index; i < argc; j++, i++) {
22472250
Local<String> arg = String::New(argv[i]);
2248-
arguments->Set(Integer::New(j), arg);
2251+
arguments->Set(Integer::New(j, node_isolate), arg);
22492252
}
22502253
// assign it
22512254
process->Set(String::NewSymbol("argv"), arguments);
22522255

22532256
// process.execArgv
22542257
Local<Array> execArgv = Array::New(option_end_index - 1);
22552258
for (j = 1, i = 0; j < option_end_index; j++, i++) {
2256-
execArgv->Set(Integer::New(i), String::New(argv[j]));
2259+
execArgv->Set(Integer::New(i, node_isolate), String::New(argv[j]));
22572260
}
22582261
// assign it
22592262
process->Set(String::NewSymbol("execArgv"), execArgv);
@@ -2270,7 +2273,7 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) {
22702273
Local<Object> env = envTemplate->NewInstance();
22712274
process->Set(String::NewSymbol("env"), env);
22722275

2273-
process->Set(String::NewSymbol("pid"), Integer::New(getpid()));
2276+
process->Set(String::NewSymbol("pid"), Integer::New(getpid(), node_isolate));
22742277
process->Set(String::NewSymbol("features"), GetFeatures());
22752278

22762279
// -e, --eval
@@ -2912,7 +2915,7 @@ void EmitExit(v8::Handle<v8::Object> process_l) {
29122915
Local<Value> emit_v = process_l->Get(String::New("emit"));
29132916
assert(emit_v->IsFunction());
29142917
Local<Function> emit = Local<Function>::Cast(emit_v);
2915-
Local<Value> args[] = { String::New("exit"), Integer::New(0) };
2918+
Local<Value> args[] = { String::New("exit"), Integer::New(0, node_isolate) };
29162919
TryCatch try_catch;
29172920
emit->Call(process_l, 2, args);
29182921
if (try_catch.HasCaught()) {

0 commit comments

Comments
 (0)