-
Notifications
You must be signed in to change notification settings - Fork 30k
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.
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
async_hooks: reduce code duplication by using a factory #13755
Closed
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
58f011f
async_hooks: reduce duplication with factory
BridgeAR 4c00eee
async_hooks: add TODO entry
BridgeAR 8a8117e
rename factory
BridgeAR 8918fc8
address comment: use named functions
BridgeAR e4cd110
fixup func-style
BridgeAR 795358a
fixup rename function
BridgeAR fc397f8
fixup add comment about naming fn
BridgeAR File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,15 +49,18 @@ const init_symbol = Symbol('init'); | |
const before_symbol = Symbol('before'); | ||
const after_symbol = Symbol('after'); | ||
const destroy_symbol = Symbol('destroy'); | ||
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative'); | ||
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative'); | ||
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative'); | ||
|
||
// Setup the callbacks that node::AsyncWrap will call when there are hooks to | ||
// process. They use the same functions as the JS embedder API. These callbacks | ||
// are setup immediately to prevent async_wrap.setupHooks() from being hijacked | ||
// and the cost of doing so is negligible. | ||
async_wrap.setupHooks({ init, | ||
before: emitBeforeN, | ||
after: emitAfterN, | ||
destroy: emitDestroyN }); | ||
before: emitBeforeNative, | ||
after: emitAfterNative, | ||
destroy: emitDestroyNative }); | ||
|
||
// Used to fatally abort the process if a callback throws. | ||
function fatalError(e) { | ||
|
@@ -325,8 +328,8 @@ function emitInitS(asyncId, type, triggerAsyncId, resource) { | |
triggerAsyncId = initTriggerId(); | ||
} | ||
|
||
// I'd prefer allowing these checks to not exist, or only throw in a debug | ||
// build, in order to improve performance. | ||
// TODO(trevnorris): I'd prefer allowing these checks to not exist, or only | ||
// throw in a debug build, in order to improve performance. | ||
if (!Number.isSafeInteger(asyncId) || asyncId < 0) | ||
throw new RangeError('asyncId must be an unsigned integer'); | ||
if (typeof type !== 'string' || type.length <= 0) | ||
|
@@ -342,24 +345,35 @@ function emitInitS(asyncId, type, triggerAsyncId, resource) { | |
} | ||
} | ||
|
||
|
||
function emitBeforeN(asyncId) { | ||
processing_hook = true; | ||
// Use a single try/catch for all hook to avoid setting up one per iteration. | ||
try { | ||
for (var i = 0; i < active_hooks_array.length; i++) { | ||
if (typeof active_hooks_array[i][before_symbol] === 'function') { | ||
active_hooks_array[i][before_symbol](asyncId); | ||
function emitHookFactory(symbol, name) { | ||
// Called from native. The asyncId stack handling is taken care of there | ||
// before this is called. | ||
// eslint-disable-next-line func-style | ||
const fn = function(asyncId) { | ||
processing_hook = true; | ||
// Use a single try/catch for all hook to avoid setting up one per | ||
// iteration. | ||
try { | ||
for (var i = 0; i < active_hooks_array.length; i++) { | ||
if (typeof active_hooks_array[i][symbol] === 'function') { | ||
active_hooks_array[i][symbol](asyncId); | ||
} | ||
} | ||
} catch (e) { | ||
fatalError(e); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You asked how to reach this require('async_hooks').createHook({
before() { throw new Error('ah crud') },
}).enable();
setTimeout(() => {}, 10); There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thx |
||
} | ||
} catch (e) { | ||
fatalError(e); | ||
} | ||
processing_hook = false; | ||
processing_hook = false; | ||
|
||
if (tmp_active_hooks_array !== null) { | ||
restoreTmpHooks(); | ||
} | ||
if (tmp_active_hooks_array !== null) { | ||
restoreTmpHooks(); | ||
} | ||
}; | ||
// Set the name property of the anonymous function as it looks good in the | ||
// stack trace. | ||
Object.defineProperty(fn, 'name', { | ||
value: name | ||
}); | ||
return fn; | ||
} | ||
|
||
|
||
|
@@ -379,29 +393,7 @@ function emitBeforeS(asyncId, triggerAsyncId = asyncId) { | |
|
||
if (async_hook_fields[kBefore] === 0) | ||
return; | ||
emitBeforeN(asyncId); | ||
} | ||
|
||
|
||
// Called from native. The asyncId stack handling is taken care of there before | ||
// this is called. | ||
function emitAfterN(asyncId) { | ||
processing_hook = true; | ||
// Use a single try/catch for all hook to avoid setting up one per iteration. | ||
try { | ||
for (var i = 0; i < active_hooks_array.length; i++) { | ||
if (typeof active_hooks_array[i][after_symbol] === 'function') { | ||
active_hooks_array[i][after_symbol](asyncId); | ||
} | ||
} | ||
} catch (e) { | ||
fatalError(e); | ||
} | ||
processing_hook = false; | ||
|
||
if (tmp_active_hooks_array !== null) { | ||
restoreTmpHooks(); | ||
} | ||
emitBeforeNative(asyncId); | ||
} | ||
|
||
|
||
|
@@ -410,7 +402,7 @@ function emitAfterN(asyncId) { | |
// after callbacks. | ||
function emitAfterS(asyncId) { | ||
if (async_hook_fields[kAfter] > 0) | ||
emitAfterN(asyncId); | ||
emitAfterNative(asyncId); | ||
|
||
popAsyncIds(asyncId); | ||
} | ||
|
@@ -425,26 +417,6 @@ function emitDestroyS(asyncId) { | |
} | ||
|
||
|
||
function emitDestroyN(asyncId) { | ||
processing_hook = true; | ||
// Use a single try/catch for all hook to avoid setting up one per iteration. | ||
try { | ||
for (var i = 0; i < active_hooks_array.length; i++) { | ||
if (typeof active_hooks_array[i][destroy_symbol] === 'function') { | ||
active_hooks_array[i][destroy_symbol](asyncId); | ||
} | ||
} | ||
} catch (e) { | ||
fatalError(e); | ||
} | ||
processing_hook = false; | ||
|
||
if (tmp_active_hooks_array !== null) { | ||
restoreTmpHooks(); | ||
} | ||
} | ||
|
||
|
||
// Emit callbacks for native calls. Since some state can be setup directly from | ||
// C++ there's no need to perform all the work here. | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good call changing this to a
TODO
.