Skip to content

async_hooks: buffer bootstrap events #29848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
guybedford wants to merge 10 commits into from
Closed

async_hooks: buffer bootstrap events #29848

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b4aa8f6
async_hooks: buffer bootstrap events
guybedford Oct 4, 2019
c28ae36
fixup example api
guybedford Oct 4, 2019
1f9e145
keep runMain in cjs
guybedford Oct 5, 2019
3bff274
add enable comment
guybedford Oct 5, 2019
f058f9f
dont delay disable
guybedford Oct 5, 2019
f8416ce
flush microtask queue instead of making sync disable
guybedford Oct 5, 2019
ac7fdca
fixup doc links
guybedford Oct 5, 2019
ae46f45
stop bootstrap buffer as soon as usercode runs
guybedford Oct 6, 2019
96dd1b9
refine promise timings
guybedford Oct 6, 2019
d98d0f1
ensure fully sync detachment
guybedford Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
stop bootstrap buffer as soon as usercode runs
  • Loading branch information
@guybedford
guybedford committed Oct 6, 2019
commit ae46f454877677e26e09b2793d8581556ab72650
18 changes: 11 additions & 7 deletions lib/internal/async_hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ function bufferBootstrapHooks() {
}
}

function clearBootstrapHooksBuffer() {
if (!bootstrapBuffer)
function stopBootstrapHooksBuffer() {
if (!bootstrapHooks)
return;
async_hook_fields[kInit]--;
async_hook_fields[kBefore]--;
Expand All @@ -299,19 +299,21 @@ function clearBootstrapHooksBuffer() {
async_hook_fields[kPromiseResolve]--;
async_hook_fields[kTotals] -= 5;
active_hooks.array.splice(active_hooks.array.indexOf(bootstrapHooks), 1);
bootstrapHooks = null;
if (async_hook_fields[kTotals] === 0) {
disableHooks();
// Flush microtasks to ensure disable has run.
process._tickCallback();
}
const _bootstrapBuffer = bootstrapBuffer;
}

function clearBootstrapHooksBuffer() {
if (bootstrapHooks)
stopBootstrapHooksBuffer();
bootstrapBuffer = null;
bootstrapHooks = null;
return _bootstrapBuffer;
}

function emitBootstrapHooksBuffer() {
const bootstrapBuffer = clearBootstrapHooksBuffer();
if (!bootstrapBuffer || async_hook_fields[kTotals] === 0) {
return;
}
Expand All @@ -331,6 +333,7 @@ function emitBootstrapHooksBuffer() {
break;
}
}
bootstrapBuffer = null;
}

let wantPromiseHook = false;
Expand Down Expand Up @@ -573,5 +576,6 @@ module.exports = {
},
bufferBootstrapHooks,
clearBootstrapHooksBuffer,
emitBootstrapHooksBuffer
emitBootstrapHooksBuffer,
stopBootstrapHooksBuffer
};
8 changes: 5 additions & 3 deletions lib/internal/modules/esm/module_job.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ const { ModuleWrap } = internalBinding('module_wrap');
const { decorateErrorStack } = require('internal/util');
const { getOptionValue } = require('internal/options');
const assert = require('internal/assert');
const { clearBootstrapHooksBuffer } = require('internal/async_hooks');
const { clearBootstrapHooksBuffer, stopBootstrapHooksBuffer } =
require('internal/async_hooks');
const resolvedPromise = SafePromise.resolve();

function noop() {}
Expand Down Expand Up @@ -107,13 +108,14 @@ class ModuleJob {
const module = await this.instantiate();
const timeout = -1;
const breakOnSigint = false;
if (this.isMain)
stopBootstrapHooksBuffer();
const output = {
module,
result: module.evaluate(timeout, breakOnSigint)
};
if (this.isMain) {
if (this.isMain)
clearBootstrapHooksBuffer();
}
return output;
}
}
Expand Down