-
Notifications
You must be signed in to change notification settings - Fork 29.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
async_hooks: use parent promise as triggerId
async_hooks init callback will be triggered when promise newly created, in previous version, the parent promise which pass from chrome V8 PromiseHook is ignored, so we can't tell the promise is a pure new promise or a chained promise. In this commit, we use the parent promise's id as triggerId to trigger the init callback. Fixes: #13302 PR-URL: #13367 Reviewed-By: Andreas Madsen <amwebdk@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
- Loading branch information
1 parent
9db02dc
commit 135f4e6
Showing
4 changed files
with
98 additions
and
1 deletion.
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
38 changes: 38 additions & 0 deletions
38
test/async-hooks/test-promise.chain-promise-before-init-hooks.js
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 |
---|---|---|
@@ -0,0 +1,38 @@ | ||
'use strict'; | ||
|
||
const common = require('../common'); | ||
const assert = require('assert'); | ||
const initHooks = require('./init-hooks'); | ||
const { checkInvocations } = require('./hook-checks'); | ||
|
||
const p = new Promise(common.mustCall(function executor(resolve, reject) { | ||
resolve(5); | ||
})); | ||
|
||
p.then(function afterresolution(val) { | ||
assert.strictEqual(val, 5); | ||
return val; | ||
}); | ||
|
||
// init hooks after chained promise is created | ||
const hooks = initHooks(); | ||
hooks._allowNoInit = true; | ||
hooks.enable(); | ||
|
||
|
||
process.on('exit', function onexit() { | ||
hooks.disable(); | ||
hooks.sanityCheck('PROMISE'); | ||
|
||
// Because the init event was never emitted the hooks listener doesn't | ||
// know what the type was. Thus check for Unknown rather than PROMISE. | ||
const as = hooks.activitiesOfTypes('PROMISE'); | ||
const unknown = hooks.activitiesOfTypes('Unknown'); | ||
assert.strictEqual(as.length, 0); | ||
assert.strictEqual(unknown.length, 1); | ||
|
||
const a0 = unknown[0]; | ||
assert.strictEqual(a0.type, 'Unknown'); | ||
assert.strictEqual(typeof a0.uid, 'number'); | ||
checkInvocations(a0, { before: 1, after: 1 }, 'when process exits'); | ||
}); |
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
42 changes: 42 additions & 0 deletions
42
test/async-hooks/test-promise.promise-before-init-hooks.js
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 |
---|---|---|
@@ -0,0 +1,42 @@ | ||
'use strict'; | ||
|
||
const common = require('../common'); | ||
const assert = require('assert'); | ||
const initHooks = require('./init-hooks'); | ||
const { checkInvocations } = require('./hook-checks'); | ||
|
||
const p = new Promise(common.mustCall(function executor(resolve, reject) { | ||
resolve(5); | ||
})); | ||
|
||
// init hooks after promise was created | ||
const hooks = initHooks({allowNoInit: true}); | ||
hooks.enable(); | ||
|
||
p.then(function afterresolution(val) { | ||
assert.strictEqual(val, 5); | ||
const as = hooks.activitiesOfTypes('PROMISE'); | ||
assert.strictEqual(as.length, 1, 'one activity'); | ||
checkInvocations(as[0], { init: 1, before: 1 }, | ||
'after resolution child promise'); | ||
return val; | ||
}); | ||
|
||
process.on('exit', function onexit() { | ||
hooks.disable(); | ||
hooks.sanityCheck('PROMISE'); | ||
|
||
const as = hooks.activitiesOfTypes('PROMISE'); | ||
assert.strictEqual(as.length, 1); | ||
|
||
const a0 = as[0]; | ||
assert.strictEqual(a0.type, 'PROMISE'); | ||
assert.strictEqual(typeof a0.uid, 'number'); | ||
// we can't get the asyncId from the parent dynamically, since init was | ||
// never called. However, it is known that the parent promise was created | ||
// immediately before the child promise, thus there should only be one | ||
// difference in id. | ||
assert.strictEqual(a0.triggerId, a0.uid - 1); | ||
// We expect a destroy hook as well but we cannot guarentee predictable gc. | ||
checkInvocations(a0, { init: 1, before: 1, after: 1 }, 'when process exits'); | ||
}); |