From 8dc6be1747d3a48af56f89e973ecb5665f89a2e1 Mon Sep 17 00:00:00 2001 From: Vladimir Kurchatkin Date: Mon, 22 Sep 2014 20:19:50 +0400 Subject: [PATCH] node: avoid automatic microtask runs 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 --- src/async-wrap-inl.h | 8 +++ src/node.cc | 10 ++++ test/simple/test-microtask-queue-run-domain.js | 59 ++++++++++++++++++++++ .../test-microtask-queue-run-immediate-domain.js | 59 ++++++++++++++++++++++ test/simple/test-microtask-queue-run-immediate.js | 58 +++++++++++++++++++++ test/simple/test-microtask-queue-run.js | 58 +++++++++++++++++++++ 6 files changed, 252 insertions(+) create mode 100644 test/simple/test-microtask-queue-run-domain.js create mode 100644 test/simple/test-microtask-queue-run-immediate-domain.js create mode 100644 test/simple/test-microtask-queue-run-immediate.js create mode 100644 test/simple/test-microtask-queue-run.js diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h index 324c57b..59157cc 100644 --- a/src/async-wrap-inl.h +++ b/src/async-wrap-inl.h @@ -139,6 +139,10 @@ inline v8::Handle AsyncWrap::MakeDomainCallback( } if (tick_info->length() == 0) { + env()->isolate()->RunMicrotasks(); + } + + if (tick_info->length() == 0) { tick_info->set_index(0); return ret; } @@ -202,6 +206,10 @@ inline v8::Handle AsyncWrap::MakeCallback( } if (tick_info->length() == 0) { + env()->isolate()->RunMicrotasks(); + } + + if (tick_info->length() == 0) { tick_info->set_index(0); return ret; } diff --git a/src/node.cc b/src/node.cc index 23edf4d..1767d25 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1091,6 +1091,10 @@ Handle MakeDomainCallback(Environment* env, } if (tick_info->length() == 0) { + env->isolate()->RunMicrotasks(); + } + + if (tick_info->length() == 0) { tick_info->set_index(0); return ret; } @@ -1155,6 +1159,10 @@ Handle MakeCallback(Environment* env, } if (tick_info->length() == 0) { + env->isolate()->RunMicrotasks(); + } + + if (tick_info->length() == 0) { tick_info->set_index(0); return ret; } @@ -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(env->immediate_check_handle())); diff --git a/test/simple/test-microtask-queue-run-domain.js b/test/simple/test-microtask-queue-run-domain.js new file mode 100644 index 0000000..2b3b763 --- /dev/null +++ b/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); diff --git a/test/simple/test-microtask-queue-run-immediate-domain.js b/test/simple/test-microtask-queue-run-immediate-domain.js new file mode 100644 index 0000000..8f95fad --- /dev/null +++ b/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++; + }); + +}); diff --git a/test/simple/test-microtask-queue-run-immediate.js b/test/simple/test-microtask-queue-run-immediate.js new file mode 100644 index 0000000..b5423eb --- /dev/null +++ b/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++; + }); + +}); diff --git a/test/simple/test-microtask-queue-run.js b/test/simple/test-microtask-queue-run.js new file mode 100644 index 0000000..c413845 --- /dev/null +++ b/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); -- 2.7.4