Skip to content

Commit 6c520af

Browse files
addaleaxjasnell
authored andcommitted
src: move DomainEnter,DomainExit to node.cc
PR-URL: #14697 Reviewed-By: Trevor Norris <trev.norris@gmail.com>
1 parent 8f12b9d commit 6c520af

File tree

3 files changed

+36
-40
lines changed

3 files changed

+36
-40
lines changed

src/async-wrap.cc

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -183,42 +183,6 @@ static void PushBackDestroyId(Environment* env, double id) {
183183
}
184184

185185

186-
bool DomainEnter(Environment* env, Local<Object> object) {
187-
Local<Value> domain_v = object->Get(env->domain_string());
188-
if (domain_v->IsObject()) {
189-
Local<Object> domain = domain_v.As<Object>();
190-
if (domain->Get(env->disposed_string())->IsTrue())
191-
return true;
192-
Local<Value> enter_v = domain->Get(env->enter_string());
193-
if (enter_v->IsFunction()) {
194-
if (enter_v.As<Function>()->Call(domain, 0, nullptr).IsEmpty()) {
195-
FatalError("node::AsyncWrap::MakeCallback",
196-
"domain enter callback threw, please report this");
197-
}
198-
}
199-
}
200-
return false;
201-
}
202-
203-
204-
bool DomainExit(Environment* env, v8::Local<v8::Object> object) {
205-
Local<Value> domain_v = object->Get(env->domain_string());
206-
if (domain_v->IsObject()) {
207-
Local<Object> domain = domain_v.As<Object>();
208-
if (domain->Get(env->disposed_string())->IsTrue())
209-
return true;
210-
Local<Value> exit_v = domain->Get(env->exit_string());
211-
if (exit_v->IsFunction()) {
212-
if (exit_v.As<Function>()->Call(domain, 0, nullptr).IsEmpty()) {
213-
FatalError("node::AsyncWrap::MakeCallback",
214-
"domain exit callback threw, please report this");
215-
}
216-
}
217-
}
218-
return false;
219-
}
220-
221-
222186
void AsyncWrap::EmitBefore(Environment* env, double async_id) {
223187
AsyncHooks* async_hooks = env->async_hooks();
224188

src/async-wrap.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,6 @@ class AsyncWrap : public BaseObject {
157157

158158
void LoadAsyncWrapperInfo(Environment* env);
159159

160-
// Return value is an indicator whether the domain was disposed.
161-
bool DomainEnter(Environment* env, v8::Local<v8::Object> object);
162-
bool DomainExit(Environment* env, v8::Local<v8::Object> object);
163-
164160
} // namespace node
165161

166162
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

src/node.cc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,42 @@ bool ShouldAbortOnUncaughtException(Isolate* isolate) {
11581158
}
11591159

11601160

1161+
bool DomainEnter(Environment* env, Local<Object> object) {
1162+
Local<Value> domain_v = object->Get(env->domain_string());
1163+
if (domain_v->IsObject()) {
1164+
Local<Object> domain = domain_v.As<Object>();
1165+
if (domain->Get(env->disposed_string())->IsTrue())
1166+
return true;
1167+
Local<Value> enter_v = domain->Get(env->enter_string());
1168+
if (enter_v->IsFunction()) {
1169+
if (enter_v.As<Function>()->Call(domain, 0, nullptr).IsEmpty()) {
1170+
FatalError("node::AsyncWrap::MakeCallback",
1171+
"domain enter callback threw, please report this");
1172+
}
1173+
}
1174+
}
1175+
return false;
1176+
}
1177+
1178+
1179+
bool DomainExit(Environment* env, v8::Local<v8::Object> object) {
1180+
Local<Value> domain_v = object->Get(env->domain_string());
1181+
if (domain_v->IsObject()) {
1182+
Local<Object> domain = domain_v.As<Object>();
1183+
if (domain->Get(env->disposed_string())->IsTrue())
1184+
return true;
1185+
Local<Value> exit_v = domain->Get(env->exit_string());
1186+
if (exit_v->IsFunction()) {
1187+
if (exit_v.As<Function>()->Call(domain, 0, nullptr).IsEmpty()) {
1188+
FatalError("node::AsyncWrap::MakeCallback",
1189+
"domain exit callback threw, please report this");
1190+
}
1191+
}
1192+
}
1193+
return false;
1194+
}
1195+
1196+
11611197
void DomainPromiseHook(PromiseHookType type,
11621198
Local<Promise> promise,
11631199
Local<Value> parent,

0 commit comments

Comments
 (0)