Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
node: avoid automatic microtask runs
Browse files Browse the repository at this point in the history
Since we are taking control of the microtask queue it makes sense to
disable autorun and only run microtasks when necessary. Just setting
isolate->SetAutorunMicrotasks(false) would cause _tickCallback() not to
be called.

Automatically running the microtask queue will cause it to run:

* After callback invocation
* Inside _tickCallback()
* After _tickCallback() invocation

The third one is unnecessary as the microtask queue is guaranteed to be
empty at this point. The first only needs to be run manually when
_tickCallback() isn't going to be called by MakeCallback().

Reviewed-by: Trevor Norris <trev.norris@gmail.com>
  • Loading branch information
vkurchatkin authored and trevnorris committed Oct 1, 2014
1 parent b705b73 commit 8dc6be1
Show file tree
Hide file tree
Showing 6 changed files with 252 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/async-wrap-inl.h
Expand Up @@ -138,6 +138,10 @@ inline v8::Handle<v8::Value> AsyncWrap::MakeDomainCallback(
return ret;
}

if (tick_info->length() == 0) {
env()->isolate()->RunMicrotasks();
}

if (tick_info->length() == 0) {
tick_info->set_index(0);
return ret;
Expand Down Expand Up @@ -201,6 +205,10 @@ inline v8::Handle<v8::Value> AsyncWrap::MakeCallback(
return ret;
}

if (tick_info->length() == 0) {
env()->isolate()->RunMicrotasks();
}

if (tick_info->length() == 0) {
tick_info->set_index(0);
return ret;
Expand Down
10 changes: 10 additions & 0 deletions src/node.cc
Expand Up @@ -1090,6 +1090,10 @@ Handle<Value> MakeDomainCallback(Environment* env,
return ret;
}

if (tick_info->length() == 0) {
env->isolate()->RunMicrotasks();
}

if (tick_info->length() == 0) {
tick_info->set_index(0);
return ret;
Expand Down Expand Up @@ -1154,6 +1158,10 @@ Handle<Value> MakeCallback(Environment* env,
return ret;
}

if (tick_info->length() == 0) {
env->isolate()->RunMicrotasks();
}

if (tick_info->length() == 0) {
tick_info->set_index(0);
return ret;
Expand Down Expand Up @@ -3594,6 +3602,8 @@ Environment* CreateEnvironment(Isolate* isolate,
Context::Scope context_scope(context);
Environment* env = Environment::New(context);

isolate->SetAutorunMicrotasks(false);

uv_check_init(env->event_loop(), env->immediate_check_handle());
uv_unref(
reinterpret_cast<uv_handle_t*>(env->immediate_check_handle()));
Expand Down
59 changes: 59 additions & 0 deletions test/simple/test-microtask-queue-run-domain.js
@@ -0,0 +1,59 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var common = require('../common');
var assert = require('assert');
var domain = require('domain');

function enqueueMicrotask(fn) {
Promise.resolve().then(fn);
}

var done = 0;

process.on('exit', function() {
assert.equal(done, 2);
});

// no nextTick, microtask
setTimeout(function() {
enqueueMicrotask(function() {
done++;
});
}, 0);


// no nextTick, microtask with nextTick
setTimeout(function() {
var called = false;

enqueueMicrotask(function() {
process.nextTick(function() {
called = true;
});
});

setTimeout(function() {
if (called)
done++;
}, 0);

}, 0);
59 changes: 59 additions & 0 deletions test/simple/test-microtask-queue-run-immediate-domain.js
@@ -0,0 +1,59 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var common = require('../common');
var assert = require('assert');
var domain = require('domain');

function enqueueMicrotask(fn) {
Promise.resolve().then(fn);
}

var done = 0;

process.on('exit', function() {
assert.equal(done, 2);
});

// no nextTick, microtask
setImmediate(function() {
enqueueMicrotask(function() {
done++;
});
});


// no nextTick, microtask with nextTick
setImmediate(function() {
var called = false;

enqueueMicrotask(function() {
process.nextTick(function() {
called = true;
});
});

setImmediate(function() {
if (called)
done++;
});

});
58 changes: 58 additions & 0 deletions test/simple/test-microtask-queue-run-immediate.js
@@ -0,0 +1,58 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var common = require('../common');
var assert = require('assert');

function enqueueMicrotask(fn) {
Promise.resolve().then(fn);
}

var done = 0;

process.on('exit', function() {
assert.equal(done, 2);
});

// no nextTick, microtask
setImmediate(function() {
enqueueMicrotask(function() {
done++;
});
});


// no nextTick, microtask with nextTick
setImmediate(function() {
var called = false;

enqueueMicrotask(function() {
process.nextTick(function() {
called = true;
});
});

setImmediate(function() {
if (called)
done++;
});

});
58 changes: 58 additions & 0 deletions test/simple/test-microtask-queue-run.js
@@ -0,0 +1,58 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var common = require('../common');
var assert = require('assert');

function enqueueMicrotask(fn) {
Promise.resolve().then(fn);
}

var done = 0;

process.on('exit', function() {
assert.equal(done, 2);
});

// no nextTick, microtask
setTimeout(function() {
enqueueMicrotask(function() {
done++;
});
}, 0);


// no nextTick, microtask with nextTick
setTimeout(function() {
var called = false;

enqueueMicrotask(function() {
process.nextTick(function() {
called = true;
});
});

setTimeout(function() {
if (called)
done++;
}, 0);

}, 0);

0 comments on commit 8dc6be1

Please sign in to comment.