Skip to content

async_hooks: use resource objects for Promises #13452

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

async_hooks: use resource objects for Promises #13452

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a187daa
async_hooks: use resource objects for Promises
addaleax Jun 4, 2017
0875682
[squash] provide parent id rather than parent resource
addaleax Jun 4, 2017
464d2af
[squash] remove getAsyncId
addaleax Jun 4, 2017
2652910
[squash] add docs
addaleax Jun 4, 2017
4acaed3
[squash] address nit
addaleax Jun 8, 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
[squash] remove getAsyncId
  • Loading branch information
@addaleax
addaleax committed Jun 8, 2017
commit 464d2af369193020ab995668aa9f01692348c0c9
1 change: 0 additions & 1 deletion src/async-wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,6 @@ static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
promise_wrap_template->SetAccessor(
FIXED_ONE_BYTE_STRING(env->isolate(), "parentId"),
PromiseWrap::GetParentId);
env->SetProtoMethod(ctor, "getAsyncId", AsyncWrap::GetAsyncId);
env->set_promise_wrap_template(promise_wrap_template);
}
}
Expand Down
2 changes: 0 additions & 2 deletions test/parallel/test-async-hooks-promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ const b = a.then(common.mustCall());
assert.strictEqual(initCalls[0].triggerId, 1);
assert.strictEqual(initCalls[0].resource.parentId, undefined);
assert.strictEqual(initCalls[0].resource.promise, a);
assert.strictEqual(initCalls[0].resource.getAsyncId(), initCalls[0].id);
assert.strictEqual(initCalls[1].triggerId, initCalls[0].id);
assert.strictEqual(initCalls[1].resource.parentId, initCalls[0].id);
assert.strictEqual(initCalls[1].resource.promise, b);
assert.strictEqual(initCalls[1].resource.getAsyncId(), initCalls[1].id);