Skip to content

Commit

Permalink
src: return early if nextTickQueue is empty
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
  • Loading branch information
trevnorris committed Dec 21, 2016
1 parent 9e4a899 commit 8f8db14
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ Local<Value> MakeCallback(Environment* env,

if (tick_info->length() == 0) {
tick_info->set_index(0);
return ret;
}

if (env->tick_callback_function()->Call(process, 0, nullptr).IsEmpty()) {
Expand Down
32 changes: 32 additions & 0 deletions test/parallel/test-no-enter-tickcallback.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use strict';

const common = require('../common');
const assert = require('assert');
var allsGood = false;
var cntr = 0;

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

/**
* This test relies upon the following internals to work as specified:
* - require('domain') causes node::Environment::set_tick_callback_function()
* to use process._tickDomainCallback() to process the nextTickQueue;
* replacing process._tickCallback().
* - 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.
*/
process._tickDomainCallback = function _tickDomainCallback() {
assert.ok(allsGood, '_tickDomainCallback should not have been called');
cntr++;
};

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

0 comments on commit 8f8db14

Please sign in to comment.