summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Chatfield <chatfielddaniel@gmail.com>2013-07-30 14:43:31 +0100
committerBert Belder <bertbelder@gmail.com>2013-08-17 15:41:03 +0200
commit98a9089f5f311e346725f016591d92eb8d532070 (patch)
tree7313647c3d327a4bfdda0305e64fab8059dcd041
parent42f926ece7ebfdb3ff896b93d362cdeb0cd00d83 (diff)
downloadnode-new-98a9089f5f311e346725f016591d92eb8d532070.tar.gz
readline: pause stdin before turning off terminal raw mode
On windows, libuv will immediately make a `ReadConsole` call (in the thread pool) when a 'flowing' `uv_tty_t` handle is switched to line-buffered mode. That causes an immediate issue for some users, since libuv can't cancel the `ReadConsole` operation on Windows 8 / Server 2012 and up if the program switches back to raw mode later. But even if this will be fixed in libuv at some point, it's better to avoid the overhead of starting work in the thread pool and immediately cancelling it afther that. See also f34f1e3, where the same change is made for the opposite flow, e.g. move `resume()` after `_setRawMode(true)`. Fixes #5927 This is a backport of dfb0461 (see #5930) to the v0.8 branch.
-rw-r--r--lib/readline.js2
-rw-r--r--test/simple/test-regress-GH-5927.js42
2 files changed, 43 insertions, 1 deletions
diff --git a/lib/readline.js b/lib/readline.js
index 8457ad666c..0fd18d6410 100644
--- a/lib/readline.js
+++ b/lib/readline.js
@@ -260,10 +260,10 @@ Interface.prototype._refreshLine = function() {
Interface.prototype.close = function() {
if (this.closed) return;
+ this.pause();
if (this.terminal) {
this._setRawMode(false);
}
- this.pause();
this.closed = true;
this.emit('close');
};
diff --git a/test/simple/test-regress-GH-5927.js b/test/simple/test-regress-GH-5927.js
new file mode 100644
index 0000000000..5f8f276616
--- /dev/null
+++ b/test/simple/test-regress-GH-5927.js
@@ -0,0 +1,42 @@
+// 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 assert = require('assert');
+var readline = require('readline');
+
+var rl = readline.createInterface(process.stdin, process.stdout);
+rl.resume();
+
+var hasPaused = false;
+
+var origPause = rl.pause;
+rl.pause = function() {
+ hasPaused = true;
+ origPause.apply(this, arguments);
+}
+
+var origSetRawMode = rl._setRawMode;
+rl._setRawMode = function(mode) {
+ assert.ok(hasPaused);
+ origSetRawMode.apply(this, arguments);
+}
+
+rl.close();