-
Notifications
You must be signed in to change notification settings - Fork 29.9k
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: fix default nextTick triggerAsyncId #14026
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -106,10 +106,15 @@ class ActivityCollector { | |
'\nExpected "destroy" to be called after "after"'); | ||
} | ||
} | ||
if (!a.handleIsObject) { | ||
v('No resource object\n' + activityString(a) + | ||
'\nExpected "init" to be called with a resource object'); | ||
} | ||
} | ||
if (violations.length) { | ||
console.error(violations.join('\n')); | ||
assert.fail(violations.length, 0, `Failed sanity checks: ${violations}`); | ||
console.error(violations.join('\n\n') + '\n'); | ||
assert.fail(violations.length, 0, | ||
`${violations.length} failed sanity checks`); | ||
} | ||
} | ||
|
||
|
@@ -147,7 +152,7 @@ class ActivityCollector { | |
// events this makes sense for a few tests in which we enable some hooks | ||
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. nit: If you're already here, could you turn this comment to a proper paragraph (capitalization, some punctuation, etc) |
||
// later | ||
if (this._allowNoInit) { | ||
const stub = { uid, type: 'Unknown' }; | ||
const stub = { uid, type: 'Unknown', handleIsObject: true }; | ||
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. Nit: maybe just 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. I would much rather be explicit, so many things could be an object. |
||
this._activities.set(uid, stub); | ||
return stub; | ||
} else { | ||
|
@@ -163,7 +168,14 @@ class ActivityCollector { | |
} | ||
|
||
_init(uid, type, triggerAsyncId, handle) { | ||
const activity = { uid, type, triggerAsyncId }; | ||
const activity = { | ||
uid, | ||
type, | ||
triggerAsyncId, | ||
// in some cases (Timeout) the handle is a function, thus the usual | ||
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. Nit: (I don't really mind but) start the sentence with a capital |
||
// `typeof handle === 'object' && handle !== null` check can't be used. | ||
handleIsObject: handle instanceof Object | ||
}; | ||
this._stamp(activity, 'init'); | ||
this._activities.set(uid, activity); | ||
this._maybeLog(uid, type, 'init'); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
'use strict'; | ||
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. Nit: style as in https://github.com/nodejs/node/blob/master/doc/guides/writing-tests.md#test-structure (and but the |
||
|
||
// Flags: --expose-internals | ||
|
||
const common = require('../common'); | ||
const assert = require('assert'); | ||
const async_hooks = require('async_hooks'); | ||
const initHooks = require('./init-hooks'); | ||
const { checkInvocations } = require('./hook-checks'); | ||
const internal = require('internal/process/next_tick'); | ||
|
||
const hooks = initHooks(); | ||
hooks.enable(); | ||
|
||
const rootAsyncId = async_hooks.executionAsyncId(); | ||
|
||
// public | ||
process.nextTick(common.mustCall(function() { | ||
assert.strictEqual(async_hooks.triggerAsyncId(), rootAsyncId); | ||
})); | ||
|
||
// internal | ||
internal.nextTick(null, common.mustCall(function() { | ||
assert.strictEqual(async_hooks.triggerAsyncId(), rootAsyncId); | ||
})); | ||
|
||
process.on('exit', function() { | ||
hooks.sanityCheck(); | ||
|
||
const as = hooks.activitiesOfTypes('TickObject'); | ||
checkInvocations(as[0], { | ||
init: 1, before: 1, after: 1, destroy: 1 | ||
}, 'when process exits'); | ||
checkInvocations(as[1], { | ||
init: 1, before: 1, after: 1, destroy: 1 | ||
}, 'when process exits'); | ||
}); |
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.
Nit: Since it's argument overload handling, could you move it up, probably just after the
if (process._exiting) return