src: return early if nextTickQueue is empty #10274

trevnorris · 2016-12-15T00:36:50Z

Checklist

make -j4 test (UNIX), or vcbuild test nosign (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines

Description of change

This brings the node::MakeCallback and node::AsyncWrap::MakeCallback
implementations into alignment in that they return early if the
nextTickQueue is empty after processing the MicrotaskQueue.

Include test to make sure early return happens. Test has text explaining
the conditions for the test to pass, since it relies on internal
mechanisms that aren't guaranteed in the future.

R=@bnoordhuis
R=@addaleax

CI: https://ci.nodejs.org/job/node-test-commit/6652/

addaleax

LGTM with a question

addaleax · 2016-12-15T14:12:49Z

test/parallel/test-no-enter-tickcallback.js

+ *  - setImmediate() uses node::MakeCallback() instead of
+ *    node::AsyncWrap::MakeCallback(). Otherwise the test will always pass.
+ *    Have not found a way to verify that node::MakeCallback() is used.
+ */


Could these conditions be checked by adding a test for the reverse situation? I.e. making sure that if there are ticks pending, the _tickDomainCallback is actually executed?

This seems like a good idea. @trevnorris?

@Fishrock123 In response to my suggestion @trevnorris added the second (nested) setImmediate call below (which seems sufficient to me)

trevnorris · 2016-12-16T00:23:06Z

@addaleax Think the update to the test addresses what you wanted to see.

CI: https://ci.nodejs.org/job/node-test-commit/6672/

addaleax

Yeah, that’s pretty much what I had in mind. Thanks, this still LGTM!

addaleax · 2016-12-16T00:51:29Z

test/parallel/test-no-enter-tickcallback.js

+
+process.on('exit', () => {
+  assert.ok(cntr > 0, '_tickDomainCallback was never called');
+});


If you think being stricter is okay, we could just wrap the fake _tickDomainCallback in common.mustCall(·, 2) (You can probably judge whether the number of calls is likely to change).

@addaleax Though on my machine it would be common.mustCall(., 3). Because we can't actually process the nextTickQueue when overriding _tickDomainCallback() we can only guarantee it will be called at least once. I don't feel that being any stricter than that is possible w/o making some shaky assumptions on how the internals work.

Likewise, adding mustCall() to process.on('exit' is pointless since mustCall callbacks are checked during 'exit'.

Though on my machine it would be common.mustCall(., 3)

I think that settles it, thanks for checking!

Fishrock123 · 2016-12-16T01:10:18Z

test/parallel/test-no-enter-tickcallback.js

+  require('domain');
+  setImmediate(() => setImmediate(() => {
+    allsGood = true;
+    process.nextTick(() => {});


These should probably also all be wrapped in common.mustCall()

I can set mustCall() around the setImmediate()'s, but not here. Since by overriding _tickDomainCallback() we loose the ability to process the nextTickQueue.

Also wrapping _tickDomainCallback() with mustCall() likewise isn't necessary since cntr is being checked on 'exit'.

trevnorris · 2016-12-16T17:28:23Z

@addaleax @Fishrock123 Issues have either been addressed by commit or comment.

CI: https://ci.nodejs.org/job/node-test-commit/6691/

This brings the node::MakeCallback and node::AsyncWrap::MakeCallback implementations into alignment in that they return early if the nextTickQueue is empty after processing the MicrotaskQueue. Include test to make sure early return happens. Test has text explaining the conditions for the test to pass, since it relies on internal mechanisms that aren't guaranteed in the future. PR-URL: nodejs#10274 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

This brings the node::MakeCallback and node::AsyncWrap::MakeCallback implementations into alignment in that they return early if the nextTickQueue is empty after processing the MicrotaskQueue. Include test to make sure early return happens. Test has text explaining the conditions for the test to pass, since it relies on internal mechanisms that aren't guaranteed in the future. PR-URL: #10274 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

trevnorris · 2016-12-21T23:21:41Z

Landed on v7.x-staging. Not critical so feel free to backport to LTS whenever.

This brings the node::MakeCallback and node::AsyncWrap::MakeCallback implementations into alignment in that they return early if the nextTickQueue is empty after processing the MicrotaskQueue. Include test to make sure early return happens. Test has text explaining the conditions for the test to pass, since it relies on internal mechanisms that aren't guaranteed in the future. PR-URL: #10274 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

This brings the node::MakeCallback and node::AsyncWrap::MakeCallback implementations into alignment in that they return early if the nextTickQueue is empty after processing the MicrotaskQueue. Include test to make sure early return happens. Test has text explaining the conditions for the test to pass, since it relies on internal mechanisms that aren't guaranteed in the future. PR-URL: nodejs/node#10274 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

trevnorris added c++ Issues and PRs that require attention from people who are familiar with C++. lts-watch-v4.x labels Dec 15, 2016

nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lts-watch-v6.x labels Dec 15, 2016

trevnorris force-pushed the makecallback-ret-early branch from adad126 to 710315a Compare December 15, 2016 00:41

nodejs-github-bot added lts-watch-v6.x labels Dec 15, 2016

addaleax approved these changes Dec 15, 2016

View reviewed changes

trevnorris force-pushed the makecallback-ret-early branch from 710315a to 77c90de Compare December 16, 2016 00:20

nodejs-github-bot added lts-watch-v6.x labels Dec 16, 2016

addaleax approved these changes Dec 16, 2016

View reviewed changes

Fishrock123 suggested changes Dec 16, 2016

View reviewed changes

trevnorris force-pushed the makecallback-ret-early branch from 77c90de to 4055548 Compare December 16, 2016 17:24

nodejs-github-bot added lts-watch-v6.x labels Dec 16, 2016

cjihrig approved these changes Dec 16, 2016

View reviewed changes

jasnell approved these changes Dec 16, 2016

View reviewed changes

Fishrock123 approved these changes Dec 19, 2016

View reviewed changes

bnoordhuis approved these changes Dec 20, 2016

View reviewed changes

trevnorris force-pushed the makecallback-ret-early branch from 4055548 to 8f8db14 Compare December 21, 2016 22:57

nodejs-github-bot added lts-watch-v6.x labels Dec 21, 2016

trevnorris closed this Dec 21, 2016

trevnorris deleted the makecallback-ret-early branch December 21, 2016 22:57

trevnorris merged commit 8f8db14 into nodejs:master Dec 21, 2016

evanlucas mentioned this pull request Jan 3, 2017

v7.4.0 release proposal #10589

Merged

MylesBorins added dont-land-on-v4.x and removed lts-watch-v4.x labels Mar 9, 2017

MylesBorins added land-on-v6.x and removed lts-watch-v6.x labels May 15, 2017

MylesBorins mentioned this pull request May 23, 2017

v6.11.0 proposal #13059

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

src: return early if nextTickQueue is empty #10274

src: return early if nextTickQueue is empty #10274

trevnorris commented Dec 15, 2016 •

edited

Loading

addaleax left a comment

addaleax Dec 15, 2016

Fishrock123 Dec 19, 2016

addaleax Dec 19, 2016

trevnorris commented Dec 16, 2016

addaleax left a comment

addaleax Dec 16, 2016

trevnorris Dec 16, 2016

trevnorris Dec 16, 2016

addaleax Dec 17, 2016

Fishrock123 Dec 16, 2016

trevnorris Dec 16, 2016

trevnorris Dec 16, 2016

trevnorris commented Dec 16, 2016

trevnorris commented Dec 21, 2016

src: return early if nextTickQueue is empty #10274

src: return early if nextTickQueue is empty #10274

Conversation

trevnorris commented Dec 15, 2016 • edited Loading

Checklist

Description of change

addaleax left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trevnorris commented Dec 16, 2016

addaleax left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trevnorris commented Dec 16, 2016

trevnorris commented Dec 21, 2016

trevnorris commented Dec 15, 2016 •

edited

Loading