Skip to content

Commit 93f75a8

Browse files
trevnorristrevnorris
committed
src: use function to get internal pointer
Remove the NODE_{WRAP,UNWRAP} macros and instead use template functions.
1 parent 4b84e42 commit 93f75a8

17 files changed

+137
-202
lines changed

‎src/fs_event_wrap.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include "env.h"
2323
#include "env-inl.h"
24+
#include "util.h"
25+
#include "util-inl.h"
2426
#include "node.h"
2527
#include "handle_wrap.h"
2628

@@ -98,8 +100,7 @@ void FSEventWrap::New(const FunctionCallbackInfo<Value>& args) {
98100
void FSEventWrap::Start(const FunctionCallbackInfo<Value>& args) {
99101
HandleScope scope(node_isolate);
100102

101-
FSEventWrap* wrap;
102-
NODE_UNWRAP(args.This(), FSEventWrap, wrap);
103+
FSEventWrap* wrap = UnwrapObject<FSEventWrap>(args.This());
103104

104105
if (args.Length() < 1 || !args[0]->IsString()) {
105106
return ThrowTypeError("Bad arguments");
@@ -178,8 +179,7 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename,
178179
void FSEventWrap::Close(const FunctionCallbackInfo<Value>& args) {
179180
HandleScope scope(node_isolate);
180181

181-
FSEventWrap* wrap;
182-
NODE_UNWRAP_NO_ABORT(args.This(), FSEventWrap, wrap);
182+
FSEventWrap* wrap = UnwrapObject<FSEventWrap>(args.This());
183183

184184
if (wrap == NULL || wrap->initialized_ == false)
185185
return;

‎src/handle_wrap.cc‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include "handle_wrap.h"
2323
#include "env.h"
2424
#include "env-inl.h"
25+
#include "util.h"
26+
#include "util-inl.h"
2527
#include "node.h"
2628
#include "queue.h"
2729

@@ -42,8 +44,7 @@ extern QUEUE handle_wrap_queue;
4244
void HandleWrap::Ref(const FunctionCallbackInfo<Value>& args) {
4345
HandleScope scope(node_isolate);
4446

45-
HandleWrap* wrap;
46-
NODE_UNWRAP_NO_ABORT(args.This(), HandleWrap, wrap);
47+
HandleWrap* wrap = UnwrapObject<HandleWrap>(args.This());
4748

4849
if (wrap != NULL && wrap->handle__ != NULL) {
4950
uv_ref(wrap->handle__);
@@ -55,8 +56,7 @@ void HandleWrap::Ref(const FunctionCallbackInfo<Value>& args) {
5556
void HandleWrap::Unref(const FunctionCallbackInfo<Value>& args) {
5657
HandleScope scope(node_isolate);
5758

58-
HandleWrap* wrap;
59-
NODE_UNWRAP_NO_ABORT(args.This(), HandleWrap, wrap);
59+
HandleWrap* wrap = UnwrapObject<HandleWrap>(args.This());
6060

6161
if (wrap != NULL && wrap->handle__ != NULL) {
6262
uv_unref(wrap->handle__);
@@ -68,8 +68,7 @@ void HandleWrap::Unref(const FunctionCallbackInfo<Value>& args) {
6868
void HandleWrap::Close(const FunctionCallbackInfo<Value>& args) {
6969
HandleScope scope(node_isolate);
7070

71-
HandleWrap* wrap;
72-
NODE_UNWRAP_NO_ABORT(args.This(), HandleWrap, wrap);
71+
HandleWrap* wrap = UnwrapObject<HandleWrap>(args.This());
7372

7473
// guard against uninitialized handle or double close
7574
if (wrap == NULL || wrap->handle__ == NULL)
@@ -96,7 +95,7 @@ HandleWrap::HandleWrap(Environment* env,
9695
handle__->data = this;
9796
HandleScope scope(node_isolate);
9897
persistent().Reset(node_isolate, object);
99-
NODE_WRAP(object, this);
98+
WrapObject<HandleWrap>(object, this);
10099
QUEUE_INSERT_TAIL(&handle_wrap_queue, &handle_wrap_queue_);
101100
}
102101

‎src/node_contextify.cc‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
#include "node_watchdog.h"
2525
#include "env.h"
2626
#include "env-inl.h"
27+
#include "util.h"
28+
#include "util-inl.h"
2729
#include "weak-object.h"
2830
#include "weak-object-inl.h"
2931

@@ -178,7 +180,7 @@ class ContextifyContext {
178180
HandleScope scope(node_isolate);
179181
Local<Object> wrapper =
180182
env->script_data_constructor_function()->NewInstance();
181-
NODE_WRAP(wrapper, this);
183+
WrapObject<ContextifyContext>(wrapper, this);
182184
return scope.Close(wrapper);
183185
}
184186

@@ -297,8 +299,8 @@ class ContextifyContext {
297299
const PropertyCallbackInfo<Value>& args) {
298300
HandleScope scope(node_isolate);
299301

300-
ContextifyContext* ctx = NULL;
301-
NODE_UNWRAP(args.Data().As<Object>(), ContextifyContext, ctx);
302+
ContextifyContext* ctx =
303+
UnwrapObject<ContextifyContext>(args.Data().As<Object>());
302304

303305
Local<Object> sandbox = PersistentToLocal(node_isolate, ctx->sandbox_);
304306
Local<Value> rv = sandbox->GetRealNamedProperty(property);
@@ -321,8 +323,8 @@ class ContextifyContext {
321323
const PropertyCallbackInfo<Value>& args) {
322324
HandleScope scope(node_isolate);
323325

324-
ContextifyContext* ctx = NULL;
325-
NODE_UNWRAP(args.Data().As<Object>(), ContextifyContext, ctx);
326+
ContextifyContext* ctx =
327+
UnwrapObject<ContextifyContext>(args.Data().As<Object>());
326328

327329
PersistentToLocal(node_isolate, ctx->sandbox_)->Set(property, value);
328330
}
@@ -333,8 +335,8 @@ class ContextifyContext {
333335
const PropertyCallbackInfo<Integer>& args) {
334336
HandleScope scope(node_isolate);
335337

336-
ContextifyContext* ctx = NULL;
337-
NODE_UNWRAP(args.Data().As<Object>(), ContextifyContext, ctx);
338+
ContextifyContext* ctx =
339+
UnwrapObject<ContextifyContext>(args.Data().As<Object>());
338340

339341
Local<Object> sandbox = PersistentToLocal(node_isolate, ctx->sandbox_);
340342
Local<Object> proxy_global = PersistentToLocal(node_isolate,
@@ -354,8 +356,8 @@ class ContextifyContext {
354356
const PropertyCallbackInfo<Boolean>& args) {
355357
HandleScope scope(node_isolate);
356358

357-
ContextifyContext* ctx = NULL;
358-
NODE_UNWRAP(args.Data().As<Object>(), ContextifyContext, ctx);
359+
ContextifyContext* ctx =
360+
UnwrapObject<ContextifyContext>(args.Data().As<Object>());
359361

360362
bool success = PersistentToLocal(node_isolate,
361363
ctx->sandbox_)->Delete(property);
@@ -371,8 +373,8 @@ class ContextifyContext {
371373
const PropertyCallbackInfo<Array>& args) {
372374
HandleScope scope(node_isolate);
373375

374-
ContextifyContext* ctx = NULL;
375-
NODE_UNWRAP(args.Data().As<Object>(), ContextifyContext, ctx);
376+
ContextifyContext* ctx =
377+
UnwrapObject<ContextifyContext>(args.Data().As<Object>());
376378

377379
Local<Object> sandbox = PersistentToLocal(node_isolate, ctx->sandbox_);
378380
args.GetReturnValue().Set(sandbox->GetPropertyNames());

‎src/node_crypto.cc‎

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
#include "env.h"
3131
#include "env-inl.h"
3232
#include "string_bytes.h"
33+
#include "util.h"
34+
#include "util-inl.h"
3335
#include "v8.h"
3436

3537
#include <errno.h>
@@ -761,8 +763,7 @@ void SecureContext::GetTicketKeys(const FunctionCallbackInfo<Value>& args) {
761763
#if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_get_tlsext_ticket_keys)
762764
HandleScope handle_scope(args.GetIsolate());
763765

764-
SecureContext* wrap;
765-
NODE_UNWRAP(args.This(), SecureContext, wrap);
766+
SecureContext* wrap = UnwrapObject<SecureContext>(args.This());
766767

767768
Local<Object> buff = Buffer::New(wrap->env(), 48);
768769
if (SSL_CTX_get_tlsext_ticket_keys(wrap->ctx_,
@@ -786,8 +787,7 @@ void SecureContext::SetTicketKeys(const FunctionCallbackInfo<Value>& args) {
786787
return ThrowTypeError("Bad argument");
787788
}
788789

789-
SecureContext* wrap;
790-
NODE_UNWRAP(args.This(), SecureContext, wrap);
790+
SecureContext* wrap = UnwrapObject<SecureContext>(args.This());
791791

792792
if (SSL_CTX_set_tlsext_ticket_keys(wrap->ctx_,
793793
Buffer::Data(args[0]),
@@ -915,8 +915,7 @@ void SSLWrap<Base>::GetPeerCertificate(
915915
const FunctionCallbackInfo<Value>& args) {
916916
HandleScope scope(node_isolate);
917917

918-
Base* w = NULL;
919-
NODE_UNWRAP(args.This(), Base, w);
918+
Base* w = UnwrapObject<Base>(args.This());
920919
Environment* env = w->env();
921920

922921
Local<Object> info = Object::New();
@@ -1050,8 +1049,7 @@ template <class Base>
10501049
void SSLWrap<Base>::GetSession(const FunctionCallbackInfo<Value>& args) {
10511050
HandleScope scope(node_isolate);
10521051

1053-
Base* w = NULL;
1054-
NODE_UNWRAP(args.This(), Base, w);
1052+
Base* w = UnwrapObject<Base>(args.This());
10551053

10561054
SSL_SESSION* sess = SSL_get_session(w->ssl_);
10571055
if (sess == NULL)
@@ -1072,8 +1070,7 @@ template <class Base>
10721070
void SSLWrap<Base>::SetSession(const FunctionCallbackInfo<Value>& args) {
10731071
HandleScope scope(node_isolate);
10741072

1075-
Base* w = NULL;
1076-
NODE_UNWRAP(args.This(), Base, w);
1073+
Base* w = UnwrapObject<Base>(args.This());
10771074

10781075
if (args.Length() < 1 ||
10791076
(!args[0]->IsString() && !Buffer::HasInstance(args[0]))) {
@@ -1111,8 +1108,7 @@ template <class Base>
11111108
void SSLWrap<Base>::LoadSession(const FunctionCallbackInfo<Value>& args) {
11121109
HandleScope scope(node_isolate);
11131110

1114-
Base* w = NULL;
1115-
NODE_UNWRAP(args.This(), Base, w);
1111+
Base* w = UnwrapObject<Base>(args.This());
11161112
Environment* env = w->env();
11171113

11181114
if (args.Length() >= 1 && Buffer::HasInstance(args[0])) {
@@ -1144,8 +1140,7 @@ void SSLWrap<Base>::LoadSession(const FunctionCallbackInfo<Value>& args) {
11441140
template <class Base>
11451141
void SSLWrap<Base>::IsSessionReused(const FunctionCallbackInfo<Value>& args) {
11461142
HandleScope scope(node_isolate);
1147-
Base* w = NULL;
1148-
NODE_UNWRAP(args.This(), Base, w);
1143+
Base* w = UnwrapObject<Base>(args.This());
11491144
bool yes = SSL_session_reused(w->ssl_);
11501145
args.GetReturnValue().Set(yes);
11511146
}
@@ -1154,8 +1149,7 @@ void SSLWrap<Base>::IsSessionReused(const FunctionCallbackInfo<Value>& args) {
11541149
template <class Base>
11551150
void SSLWrap<Base>::ReceivedShutdown(const FunctionCallbackInfo<Value>& args) {
11561151
HandleScope scope(node_isolate);
1157-
Base* w = NULL;
1158-
NODE_UNWRAP(args.This(), Base, w);
1152+
Base* w = UnwrapObject<Base>(args.This());
11591153
bool yes = SSL_get_shutdown(w->ssl_) == SSL_RECEIVED_SHUTDOWN;
11601154
args.GetReturnValue().Set(yes);
11611155
}
@@ -1164,8 +1158,7 @@ void SSLWrap<Base>::ReceivedShutdown(const FunctionCallbackInfo<Value>& args) {
11641158
template <class Base>
11651159
void SSLWrap<Base>::EndParser(const FunctionCallbackInfo<Value>& args) {
11661160
HandleScope scope(node_isolate);
1167-
Base* w = NULL;
1168-
NODE_UNWRAP(args.This(), Base, w);
1161+
Base* w = UnwrapObject<Base>(args.This());
11691162
w->hello_parser_.End();
11701163
}
11711164

@@ -1174,8 +1167,7 @@ template <class Base>
11741167
void SSLWrap<Base>::Renegotiate(const FunctionCallbackInfo<Value>& args) {
11751168
HandleScope scope(node_isolate);
11761169

1177-
Base* w = NULL;
1178-
NODE_UNWRAP(args.This(), Base, w);
1170+
Base* w = UnwrapObject<Base>(args.This());
11791171

11801172
ClearErrorOnReturn clear_error_on_return;
11811173
(void) &clear_error_on_return; // Silence unused variable warning.
@@ -1188,8 +1180,7 @@ void SSLWrap<Base>::Renegotiate(const FunctionCallbackInfo<Value>& args) {
11881180
template <class Base>
11891181
void SSLWrap<Base>::IsInitFinished(const FunctionCallbackInfo<Value>& args) {
11901182
HandleScope scope(node_isolate);
1191-
Base* w = NULL;
1192-
NODE_UNWRAP(args.This(), Base, w);
1183+
Base* w = UnwrapObject<Base>(args.This());
11931184
bool yes = SSL_is_init_finished(w->ssl_);
11941185
args.GetReturnValue().Set(yes);
11951186
}
@@ -1200,8 +1191,7 @@ template <class Base>
12001191
void SSLWrap<Base>::VerifyError(const FunctionCallbackInfo<Value>& args) {
12011192
HandleScope scope(node_isolate);
12021193

1203-
Base* w = NULL;
1204-
NODE_UNWRAP(args.This(), Base, w);
1194+
Base* w = UnwrapObject<Base>(args.This());
12051195

12061196
// XXX(indutny) Do this check in JS land?
12071197
X509* peer_cert = SSL_get_peer_certificate(w->ssl_);
@@ -1267,8 +1257,7 @@ template <class Base>
12671257
void SSLWrap<Base>::GetCurrentCipher(const FunctionCallbackInfo<Value>& args) {
12681258
HandleScope scope(node_isolate);
12691259

1270-
Base* w = NULL;
1271-
NODE_UNWRAP(args.This(), Base, w);
1260+
Base* w = UnwrapObject<Base>(args.This());
12721261
Environment* env = w->env();
12731262

12741263
OPENSSL_CONST SSL_CIPHER* c = SSL_get_current_cipher(w->ssl_);
@@ -1363,8 +1352,7 @@ void SSLWrap<Base>::GetNegotiatedProto(
13631352
const FunctionCallbackInfo<Value>& args) {
13641353
HandleScope scope(node_isolate);
13651354

1366-
Base* w = NULL;
1367-
NODE_UNWRAP(args.This(), Base, w);
1355+
Base* w = UnwrapObject<Base>(args.This());
13681356

13691357
if (w->is_client()) {
13701358
if (w->selected_npn_proto_.IsEmpty() == false) {
@@ -1390,8 +1378,7 @@ template <class Base>
13901378
void SSLWrap<Base>::SetNPNProtocols(const FunctionCallbackInfo<Value>& args) {
13911379
HandleScope scope(node_isolate);
13921380

1393-
Base* w = NULL;
1394-
NODE_UNWRAP(args.This(), Base, w);
1381+
Base* w = UnwrapObject<Base>(args.This());
13951382

13961383
if (args.Length() < 1 || !Buffer::HasInstance(args[0]))
13971384
return ThrowTypeError("Must give a Buffer as first argument");

‎src/node_internals.h‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -173,37 +173,6 @@ NO_RETURN void FatalError(const char* location, const char* message);
173173

174174
v8::Local<v8::Object> BuildStatsObject(Environment* env, const uv_stat_t* s);
175175

176-
#define NODE_WRAP(Object, Pointer) \
177-
do { \
178-
assert(!Object.IsEmpty()); \
179-
assert(Object->InternalFieldCount() > 0); \
180-
Object->SetAlignedPointerInInternalField(0, Pointer); \
181-
} \
182-
while (0)
183-
184-
#define NODE_UNWRAP(Object, TypeName, Var) \
185-
do { \
186-
assert(!Object.IsEmpty()); \
187-
assert(Object->InternalFieldCount() > 0); \
188-
Var = static_cast<TypeName*>( \
189-
Object->GetAlignedPointerFromInternalField(0)); \
190-
if (!Var) { \
191-
fprintf(stderr, #TypeName ": Aborting due to unwrap failure at %s:%d\n", \
192-
__FILE__, __LINE__); \
193-
abort(); \
194-
} \
195-
} \
196-
while (0)
197-
198-
#define NODE_UNWRAP_NO_ABORT(Object, TypeName, Var) \
199-
do { \
200-
assert(!Object.IsEmpty()); \
201-
assert(Object->InternalFieldCount() > 0); \
202-
Var = static_cast<TypeName*>( \
203-
Object->GetAlignedPointerFromInternalField(0)); \
204-
} \
205-
while (0)
206-
207176
enum Endianness {
208177
kLittleEndian, // _Not_ LITTLE_ENDIAN, clashes with endian.h.
209178
kBigEndian

‎src/node_stat_watcher.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#ifndef SRC_NODE_STAT_WATCHER_H_
2323
#define SRC_NODE_STAT_WATCHER_H_
2424

25-
#include "env.h"
2625
#include "node.h"
26+
#include "env.h"
27+
#include "weak-object.h"
2728
#include "uv.h"
2829
#include "v8.h"
29-
#include "weak-object.h"
3030

3131
namespace node {
3232

0 commit comments

Comments
 (0)