Skip to content

async_hooks: reduce code duplication by using a factory #13755

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
BridgeAR wants to merge 7 commits into from
Closed

async_hooks: reduce code duplication by using a factory #13755

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58f011f
async_hooks: reduce duplication with factory
BridgeAR Jun 18, 2017
4c00eee
async_hooks: add TODO entry
BridgeAR Jun 18, 2017
8a8117e
rename factory
BridgeAR Jun 21, 2017
8918fc8
address comment: use named functions
BridgeAR Jun 30, 2017
e4cd110
fixup func-style
BridgeAR Jul 3, 2017
795358a
fixup rename function
BridgeAR Jul 3, 2017
fc397f8
fixup add comment about naming fn
BridgeAR Jul 3, 2017
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
address comment: use named functions
  • Loading branch information
@BridgeAR
BridgeAR committed Jun 30, 2017
commit 8918fc88481fbbf2a249c2f44cb4aca476103548
14 changes: 9 additions & 5 deletions lib/async_hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ const init_symbol = Symbol('init');
const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const emitBeforeN = emitHookFactory(before_symbol);
const emitAfterN = emitHookFactory(after_symbol);
const emitDestroyN = emitHookFactory(destroy_symbol);
const emitBeforeN = emitHookFactory(before_symbol, 'emitBeforeN');
Copy link
Copy Markdown
Member

@AndreasMadsen AndreasMadsen Jul 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you change the N to Native while you are at it? That short naming convention really annoys me.

Copy link
Copy Markdown
Member Author

@BridgeAR BridgeAR Jul 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess in that case the the S should also be renamed but I can't think of what it stands for right now. Does it stand for Script?

const emitAfterN = emitHookFactory(after_symbol, 'emitAfterN');
const emitDestroyN = emitHookFactory(destroy_symbol, 'emitDestroyN');

// 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
Expand Down Expand Up @@ -345,10 +345,10 @@ function emitInitS(asyncId, type, triggerAsyncId, resource) {
}
}

function emitHookFactory(symbol) {
function emitHookFactory(symbol, name) {
// Called from native. The asyncId stack handling is taken care of there
// before this is called.
return function(asyncId) {
const fn = function(asyncId) {
processing_hook = true;
// Use a single try/catch for all hook to avoid setting up one per
// iteration.
Expand All @@ -367,6 +367,10 @@ function emitHookFactory(symbol) {
restoreTmpHooks();
}
};
Object.defineProperty(fn, 'name', {
Copy link
Copy Markdown
Member

@AndreasMadsen AndreasMadsen Jul 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mind leaving a comment that explains this sets the anonymous function name such it looks good in stack traces.

value: name
});
return fn;
}


Expand Down