Skip to content

Commit 51f6e6a

Browse files
bnoordhuisbnoordhuis
committed
src, test: downgrade to v8 3.14 api
1 parent 03fe7fb commit 51f6e6a

27 files changed

Lines changed: 382 additions & 396 deletions

‎src/cares_wrap.cc‎

Lines changed: 25 additions & 25 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, node_isolate), address);
206+
addresses->Set(Integer::New(i), 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, node_isolate), address);
219+
names->Set(Integer::New(i), 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, node_isolate), answer };
340+
Local<Value> argv[2] = { Integer::New(0), 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, node_isolate), answer, family };
346+
Local<Value> argv[3] = { Integer::New(0), 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, node_isolate) };
355+
Local<Value> argv[1] = { Integer::New(-1) };
356356
MakeCallback(object_, oncomplete_sym, ARRAY_SIZE(argv), argv);
357357
}
358358

@@ -492,8 +492,8 @@ class QueryMxWrap: public QueryWrap {
492492
Local<Object> mx_record = Object::New();
493493
mx_record->Set(exchange_symbol, String::New(mx_current->host));
494494
mx_record->Set(priority_symbol,
495-
Integer::New(mx_current->priority, node_isolate));
496-
mx_records->Set(Integer::New(i++, node_isolate), mx_record);
495+
Integer::New(mx_current->priority));
496+
mx_records->Set(Integer::New(i++), mx_record);
497497
}
498498

499499
ares_free_data(mx_start);
@@ -550,7 +550,7 @@ class QueryTxtWrap: public QueryWrap {
550550
struct ares_txt_reply *current = txt_out;
551551
for (int i = 0; current; ++i, current = current->next) {
552552
Local<String> txt = String::New(reinterpret_cast<char*>(current->txt));
553-
txt_records->Set(Integer::New(i, node_isolate), txt);
553+
txt_records->Set(Integer::New(i), txt);
554554
}
555555

556556
ares_free_data(txt_out);
@@ -595,12 +595,12 @@ class QuerySrvWrap: public QueryWrap {
595595
Local<Object> srv_record = Object::New();
596596
srv_record->Set(name_symbol, String::New(srv_current->host));
597597
srv_record->Set(port_symbol,
598-
Integer::New(srv_current->port, node_isolate));
598+
Integer::New(srv_current->port));
599599
srv_record->Set(priority_symbol,
600-
Integer::New(srv_current->priority, node_isolate));
600+
Integer::New(srv_current->priority));
601601
srv_record->Set(weight_symbol,
602-
Integer::New(srv_current->weight, node_isolate));
603-
srv_records->Set(Integer::New(i++, node_isolate), srv_record);
602+
Integer::New(srv_current->weight));
603+
srv_records->Set(Integer::New(i++), srv_record);
604604
}
605605

606606
ares_free_data(srv_start);
@@ -656,7 +656,7 @@ class GetHostByNameWrap: public QueryWrap {
656656
HandleScope scope;
657657

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

661661
this->CallOnComplete(addresses, family);
662662
}
@@ -677,15 +677,15 @@ static Handle<Value> Query(const Arguments& args) {
677677
// We must cache the wrap's js object here, because cares might make the
678678
// callback from the wrap->Send stack. This will destroy the wrap's internal
679679
// object reference, causing wrap->GetObject() to return undefined.
680-
Local<Object> object = Local<Object>::New(node_isolate, wrap->GetObject());
680+
Local<Object> object = Local<Object>::New(wrap->GetObject());
681681

682682
String::Utf8Value name(args[0]);
683683

684684
int r = wrap->Send(*name);
685685
if (r) {
686686
SetAresErrno(r);
687687
delete wrap;
688-
return scope.Close(v8::Null(node_isolate));
688+
return scope.Close(v8::Null());
689689
} else {
690690
return scope.Close(object);
691691
}
@@ -706,7 +706,7 @@ static Handle<Value> QueryWithFamily(const Arguments& args) {
706706
// We must cache the wrap's js object here, because cares might make the
707707
// callback from the wrap->Send stack. This will destroy the wrap's internal
708708
// object reference, causing wrap->GetObject() to return undefined.
709-
Local<Object> object = Local<Object>::New(node_isolate, wrap->GetObject());
709+
Local<Object> object = Local<Object>::New(wrap->GetObject());
710710

711711
String::Utf8Value name(args[0]);
712712
int family = args[1]->Int32Value();
@@ -715,7 +715,7 @@ static Handle<Value> QueryWithFamily(const Arguments& args) {
715715
if (r) {
716716
SetAresErrno(r);
717717
delete wrap;
718-
return scope.Close(v8::Null(node_isolate));
718+
return scope.Close(v8::Null());
719719
} else {
720720
return scope.Close(object);
721721
}
@@ -732,7 +732,7 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) {
732732
if (status) {
733733
// Error
734734
SetErrno(uv_last_error(uv_default_loop()));
735-
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
735+
argv[0] = Local<Value>::New(Null());
736736
} else {
737737
// Success
738738
struct addrinfo *address;
@@ -824,14 +824,14 @@ static Handle<Value> IsIP(const Arguments& args) {
824824
char address_buffer[sizeof(struct in6_addr)];
825825

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

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

834-
return scope.Close(v8::Integer::New(0, node_isolate));
834+
return scope.Close(v8::Integer::New(0));
835835
}
836836

837837

@@ -871,7 +871,7 @@ static Handle<Value> GetAddrInfo(const Arguments& args) {
871871
if (r) {
872872
SetErrno(uv_last_error(uv_default_loop()));
873873
delete req_wrap;
874-
return scope.Close(v8::Null(node_isolate));
874+
return scope.Close(v8::Null());
875875
} else {
876876
return scope.Close(req_wrap->object_);
877877
}
@@ -915,11 +915,11 @@ static void Initialize(Handle<Object> target) {
915915
NODE_SET_METHOD(target, "isIP", IsIP);
916916

917917
target->Set(String::NewSymbol("AF_INET"),
918-
Integer::New(AF_INET, node_isolate));
918+
Integer::New(AF_INET));
919919
target->Set(String::NewSymbol("AF_INET6"),
920-
Integer::New(AF_INET6, node_isolate));
920+
Integer::New(AF_INET6));
921921
target->Set(String::NewSymbol("AF_UNSPEC"),
922-
Integer::New(AF_UNSPEC, node_isolate));
922+
Integer::New(AF_UNSPEC));
923923

924924
oncomplete_sym = NODE_PSYMBOL("oncomplete");
925925
}

‎src/fs_event_wrap.cc‎

Lines changed: 6 additions & 6 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, node_isolate));
113+
return scope.Close(Integer::New(r));
114114
}
115115

116116

@@ -136,7 +136,7 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename,
136136
// unreasonable, right? Still, we should revisit this before v1.0.
137137
if (status) {
138138
SetErrno(uv_last_error(uv_default_loop()));
139-
eventStr = String::Empty(node_isolate);
139+
eventStr = String::Empty();
140140
}
141141
else if (events & UV_RENAME) {
142142
eventStr = String::New("rename");
@@ -150,10 +150,10 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename,
150150
}
151151

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

159159
if (onchange_sym.IsEmpty()) {
@@ -172,11 +172,11 @@ Handle<Value> FSEventWrap::Close(const Arguments& args) {
172172
// and legal, HandleWrap::Close() deals with them the same way.
173173
assert(!args.Holder().IsEmpty());
174174
assert(args.Holder()->InternalFieldCount() > 0);
175-
void* ptr = args.Holder()->GetAlignedPointerFromInternalField(0);
175+
void* ptr = args.Holder()->GetPointerFromInternalField(0);
176176
FSEventWrap* wrap = static_cast<FSEventWrap*>(ptr);
177177

178178
if (wrap == NULL || wrap->initialized_ == false) {
179-
return Undefined(node_isolate);
179+
return Undefined();
180180
}
181181
wrap->initialized_ = false;
182182

‎src/handle_wrap.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
assert(!args.Holder().IsEmpty()); \
2828
assert(args.Holder()->InternalFieldCount() > 0); \
2929
type* wrap = static_cast<type*>( \
30-
args.Holder()->GetAlignedPointerFromInternalField(0));
30+
args.Holder()->GetPointerFromInternalField(0));
3131

3232
namespace node {
3333

@@ -66,7 +66,7 @@ Handle<Value> HandleWrap::Ref(const Arguments& args) {
6666
wrap->unref_ = false;
6767
}
6868

69-
return v8::Undefined(node_isolate);
69+
return v8::Undefined();
7070
}
7171

7272

@@ -80,15 +80,15 @@ Handle<Value> HandleWrap::Unref(const Arguments& args) {
8080
wrap->unref_ = true;
8181
}
8282

83-
return v8::Undefined(node_isolate);
83+
return v8::Undefined();
8484
}
8585

8686

8787
Handle<Value> HandleWrap::Close(const Arguments& args) {
8888
HandleScope scope;
8989

9090
HandleWrap *wrap = static_cast<HandleWrap*>(
91-
args.Holder()->GetAlignedPointerFromInternalField(0));
91+
args.Holder()->GetPointerFromInternalField(0));
9292

9393
// guard against uninitialized handle or double close
9494
if (wrap && wrap->handle__) {
@@ -97,7 +97,7 @@ Handle<Value> HandleWrap::Close(const Arguments& args) {
9797
wrap->handle__ = NULL;
9898
}
9999

100-
return v8::Null(node_isolate);
100+
return v8::Null();
101101
}
102102

103103

@@ -112,7 +112,7 @@ HandleWrap::HandleWrap(Handle<Object> object, uv_handle_t* h) {
112112
assert(object_.IsEmpty());
113113
assert(object->InternalFieldCount() > 0);
114114
object_ = v8::Persistent<v8::Object>::New(object);
115-
object_->SetAlignedPointerInInternalField(0, this);
115+
object_->SetPointerInInternalField(0, this);
116116
ngx_queue_insert_tail(&handle_wrap_queue, &handle_wrap_queue_);
117117
}
118118

@@ -138,7 +138,7 @@ void HandleWrap::OnClose(uv_handle_t* handle) {
138138
// But the handle pointer should be gone.
139139
assert(wrap->handle__ == NULL);
140140

141-
wrap->object_->SetAlignedPointerInInternalField(0, NULL);
141+
wrap->object_->SetPointerInInternalField(0, NULL);
142142
wrap->object_.Dispose();
143143
wrap->object_.Clear();
144144

0 commit comments

Comments
 (0)