FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

domain: remove native domain code · nodejs/node@ba47632 · GitHub

/ node Public

Commit ba47632

Browse files
Qard
authored and
codebytere
committed
domain: remove native domain code
With the async_hooks callback trampoline, domains no longer need any native code. With this, domains can exist in pure JavaScript. PR-URL: #33801 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Vladimir de Turckheim <vlad2t@hotmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Andrey Pechkurov <apechkurov@gmail.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
1 parent 0d79c53 commit ba47632

7 files changed

Lines changed: 14 additions & 58 deletions

File tree

‎lib/domain.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const {
4242
ERR_UNHANDLED_ERROR
4343
} = require('internal/errors').codes;
4444
const { createHook } = require('async_hooks');
45+
const { useDomainTrampoline } = require('internal/async_hooks');
4546

4647
// TODO(addaleax): Use a non-internal solution for this.
4748
const kWeak = Symbol('kWeak');
@@ -145,7 +146,7 @@ function topLevelDomainCallback(cb, ...args) {
145146
// another one. The stack is each entered domain.
146147
const stack = [];
147148
exports._stack = stack;
148-
internalBinding('domain').enable(topLevelDomainCallback);
149+
useDomainTrampoline(topLevelDomainCallback);
149150

150151
function updateExceptionCapture() {
151152
if (stack.every((domain) => domain.listenerCount('error') === 0)) {

‎lib/internal/async_hooks.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,13 @@ const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
103103
const emitPromiseResolveNative =
104104
emitHookFactory(promise_resolve_symbol, 'emitPromiseResolveNative');
105105

106-
function callbackTrampoline(asyncId, cb, domain_cb, ...args) {
107-
if (hasHooks(kBefore))
106+
let domain_cb;
107+
function useDomainTrampoline(fn) {
108+
domain_cb = fn;
109+
}
110+
111+
function callbackTrampoline(asyncId, cb, ...args) {
112+
if (asyncId && hasHooks(kBefore))
108113
emitBeforeNative(asyncId);
109114

110115
let result;
@@ -115,7 +120,7 @@ function callbackTrampoline(asyncId, cb, domain_cb, ...args) {
115120
result = ReflectApply(cb, this, args);
116121
}
117122

118-
if (hasHooks(kAfter))
123+
if (asyncId && hasHooks(kAfter))
119124
emitAfterNative(asyncId);
120125

121126
return result;
@@ -498,6 +503,7 @@ module.exports = {
498503
emitAfter: emitAfterScript,
499504
emitDestroy: emitDestroyScript,
500505
registerDestroyHook,
506+
useDomainTrampoline,
501507
nativeHooks: {
502508
init: emitInitNative,
503509
before: emitBeforeNative,

‎node.gyp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,6 @@
571571
'src/node_contextify.cc',
572572
'src/node_credentials.cc',
573573
'src/node_dir.cc',
574-
'src/node_domain.cc',
575574
'src/node_env_var.cc',
576575
'src/node_errors.cc',
577576
'src/node_file.cc',

‎src/api/callback.cc‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -173,29 +173,16 @@ MaybeLocal<Value> InternalMakeCallback(Environment* env,
173173
return MaybeLocal<Value>();
174174
}
175175

176-
Local<Function> domain_cb = env->domain_callback();
177176
MaybeLocal<Value> ret;
178177

179-
if (asyncContext.async_id != 0 && hook_count != 0) {
180-
MaybeStackBuffer<Local<Value>, 16> args(3 + argc);
178+
if (hook_count != 0) {
179+
MaybeStackBuffer<Local<Value>, 16> args(2 + argc);
181180
args[0] = v8::Number::New(env->isolate(), asyncContext.async_id);
182181
args[1] = callback;
183-
if (domain_cb.IsEmpty()) {
184-
args[2] = Undefined(env->isolate());
185-
} else {
186-
args[2] = domain_cb;
187-
}
188182
for (int i = 0; i < argc; i++) {
189-
args[i + 3] = argv[i];
183+
args[i + 2] = argv[i];
190184
}
191185
ret = hook_cb->Call(env->context(), recv, args.length(), &args[0]);
192-
} else if (asyncContext.async_id == 0 && !domain_cb.IsEmpty()) {
193-
MaybeStackBuffer<Local<Value>, 16> args(1 + argc);
194-
args[0] = callback;
195-
for (int i = 0; i < argc; i++) {
196-
args[i + 1] = argv[i];
197-
}
198-
ret = domain_cb->Call(env->context(), recv, args.length(), &args[0]);
199186
} else {
200187
ret = callback->Call(env->context(), recv, argc, argv);
201188
}

‎src/env.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,6 @@ constexpr size_t kFsStatsBufferLength =
441441
V(async_hooks_promise_resolve_function, v8::Function) \
442442
V(buffer_prototype_object, v8::Object) \
443443
V(crypto_key_object_constructor, v8::Function) \
444-
V(domain_callback, v8::Function) \
445444
V(domexception_function, v8::Function) \
446445
V(enhance_fatal_stack_after_inspector, v8::Function) \
447446
V(enhance_fatal_stack_before_inspector, v8::Function) \

‎src/node_binding.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
V(config) \
4343
V(contextify) \
4444
V(credentials) \
45-
V(domain) \
4645
V(errors) \
4746
V(fs) \
4847
V(fs_dir) \

‎src/node_domain.cc‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL