From 25c32078e96fe0d2be037ec168cd8cc69e26e7f6 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 28 Sep 2016 12:01:48 +0200 Subject: [PATCH] lib: fix beforeExit not working with -e Commit 93a44d5 ("src: fix deferred events not working with -e") defers evaluation of the script to the next tick. A side effect of that change is that 'beforeExit' listeners run before the actual script. 'beforeExit' is emitted when the event loop is empty but process.nextTick() does not ref the event loop. Fix that by using setImmediate(). Because it is implemented in terms of a uv_check_t handle, it interacts with the event loop properly. Ref: https://github.com/nodejs/node/pull/9680 Fixes: https://github.com/nodejs/node/issues/8534 PR-URL: https://github.com/nodejs/node/pull/8821 Reviewed-By: Colin Ihrig --- src/node.js | 2 +- test/message/eval_messages.out | 20 ++++++++------------ test/message/stdin_messages.out | 20 ++++++++------------ test/parallel/test-cli-eval.js | 15 +++++++++++++++ 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/node.js b/src/node.js index 7772942de79ca1..4d86dc92e5589b 100644 --- a/src/node.js +++ b/src/node.js @@ -591,7 +591,7 @@ // Defer evaluation for a tick. This is a workaround for deferred // events not firing when evaluating scripts from the command line, // see https://github.com/nodejs/node/issues/1600. - process.nextTick(function() { + setImmediate(function() { var result = module._compile(script, `${name}-wrapper`); if (process._print_eval) console.log(result); }); diff --git a/test/message/eval_messages.out b/test/message/eval_messages.out index 4fb3c7f56d5859..a7f09aa4b5c6c7 100644 --- a/test/message/eval_messages.out +++ b/test/message/eval_messages.out @@ -6,9 +6,8 @@ SyntaxError: Strict mode code may not include a with statement at Object.exports.runInThisContext (vm.js:*) at Object. ([eval]-wrapper:*:*) at Module._compile (module.js:*:*) - at node.js:*:* - at nextTickCallbackWith0Args (node.js:*:*) - at process._tickCallback (node.js:*:*) + at Immediate._onImmediate (node.js:*:*) + at processImmediate [as _immediateCallback] (timers.js:*:*) 42 42 [eval]:1 @@ -19,9 +18,8 @@ Error: hello at Object.exports.runInThisContext (vm.js:*) at Object. ([eval]-wrapper:*:*) at Module._compile (module.js:*:*) - at node.js:*:* - at nextTickCallbackWith0Args (node.js:*:*) - at process._tickCallback (node.js:*:*) + at Immediate._onImmediate (node.js:*:*) + at processImmediate [as _immediateCallback] (timers.js:*:*) [eval]:1 throw new Error("hello") ^ @@ -30,9 +28,8 @@ Error: hello at Object.exports.runInThisContext (vm.js:*) at Object. ([eval]-wrapper:*:*) at Module._compile (module.js:*:*) - at node.js:*:* - at nextTickCallbackWith0Args (node.js:*:*) - at process._tickCallback (node.js:*:*) + at Immediate._onImmediate (node.js:*:*) + at processImmediate [as _immediateCallback] (timers.js:*:*) 100 [eval]:1 var x = 100; y = x; @@ -42,9 +39,8 @@ ReferenceError: y is not defined at Object.exports.runInThisContext (vm.js:*) at Object. ([eval]-wrapper:*:*) at Module._compile (module.js:*:*) - at node.js:*:* - at nextTickCallbackWith0Args (node.js:*:*) - at process._tickCallback (node.js:*:*) + at Immediate._onImmediate (node.js:*:*) + at processImmediate [as _immediateCallback] (timers.js:*:*) [eval]:1 var ______________________________________________; throw 10 ^ diff --git a/test/message/stdin_messages.out b/test/message/stdin_messages.out index 57908426079e15..a178bf0920ba64 100644 --- a/test/message/stdin_messages.out +++ b/test/message/stdin_messages.out @@ -7,9 +7,8 @@ SyntaxError: Strict mode code may not include a with statement at Object.exports.runInThisContext (vm.js:*) at Object. ([stdin]-wrapper:*:*) at Module._compile (module.js:*:*) - at node.js:*:* - at nextTickCallbackWith0Args (node.js:*:*) - at process._tickCallback (node.js:*:*) + at Immediate._onImmediate (node.js:*:*) + at processImmediate [as _immediateCallback] (timers.js:*:*) 42 42 @@ -21,9 +20,8 @@ Error: hello at Object.exports.runInThisContext (vm.js:*) at Object. ([stdin]-wrapper:*:*) at Module._compile (module.js:*:*) - at node.js:*:* - at nextTickCallbackWith0Args (node.js:*:*) - at process._tickCallback (node.js:*:*) + at Immediate._onImmediate (node.js:*:*) + at processImmediate [as _immediateCallback] (timers.js:*:*) [stdin]:1 throw new Error("hello") @@ -33,9 +31,8 @@ Error: hello at Object.exports.runInThisContext (vm.js:*) at Object. ([stdin]-wrapper:*:*) at Module._compile (module.js:*:*) - at node.js:*:* - at nextTickCallbackWith0Args (node.js:*:*) - at process._tickCallback (node.js:*:*) + at Immediate._onImmediate (node.js:*:*) + at processImmediate [as _immediateCallback] (timers.js:*:*) 100 [stdin]:1 @@ -46,9 +43,8 @@ ReferenceError: y is not defined at Object.exports.runInThisContext (vm.js:*) at Object. ([stdin]-wrapper:*:*) at Module._compile (module.js:*:*) - at node.js:*:* - at nextTickCallbackWith0Args (node.js:*:*) - at process._tickCallback (node.js:*:*) + at Immediate._onImmediate (node.js:*:*) + at processImmediate [as _immediateCallback] (timers.js:*:*) [stdin]:1 var ______________________________________________; throw 10 diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js index e6a47a3175172e..f832fce64704cc 100644 --- a/test/parallel/test-cli-eval.js +++ b/test/parallel/test-cli-eval.js @@ -90,3 +90,18 @@ child.exec(nodejs + ` -e 'require("child_process").fork("${emptyFile}")'`, assert.equal(stdout, ''); assert.equal(stderr, ''); }); + +// Regression test for https://github.com/nodejs/node/issues/8534. +{ + const script = ` + // console.log() can revive the event loop so we must be careful + // to write from a 'beforeExit' event listener only once. + process.once("beforeExit", () => console.log("beforeExit")); + process.on("exit", () => console.log("exit")); + console.log("start"); + `; + const options = { encoding: 'utf8' }; + const proc = child.spawnSync(process.execPath, ['-e', script], options); + assert.strictEqual(proc.stderr, ''); + assert.strictEqual(proc.stdout, 'start\nbeforeExit\nexit\n'); +}