Skip to content

Commit

Permalink
lib: fix stdio/ipc sync i/o regression
Browse files Browse the repository at this point in the history
process.send() should be synchronous, it should block until the message
has been sent in full, but it wasn't after the second-to-last libuv
upgrade because of commit libuv/libuv@393c1c5 ("unix: set non-block
mode in uv_{pipe,tcp,udp}_open"), which made its way into io.js in
commit 07bd05b ("deps: update libuv to 1.2.1").

Commit libuv/libuv@b36d4ff ("unix: implement uv_stream_set_blocking()")
as landed in io.js in commit 9681fca ("deps: update libuv to 1.4.0")
makes it possible to restore the synchronous behavior again and that's
precisely what this commit does.

The same line of reasoning applies to `net.Socket({ fd: 1 })`: creating
a socket object from a stdio file descriptor, like the `process.stdout`
getter does, should put the file descriptor in blocking mode for
compatibility reasons.

Fixes: nodejs#760
Fixes: nodejs#784
  • Loading branch information
bnoordhuis committed Feb 10, 2015
1 parent aea9b89 commit 1fea458
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 4 deletions.
7 changes: 7 additions & 0 deletions lib/child_process.js
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,13 @@ exports._forkChild = function(fd) {
// set process.send()
var p = createPipe(true);
p.open(fd);

// p.open() puts the file descriptor in non-blocking mode
// but it must be synchronous for backwards compatibility.
var err = p.setBlocking(true);
if (err)
throw errnoException(err, 'setBlocking');

p.unref();
setupChannel(process, p);

Expand Down
7 changes: 3 additions & 4 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ function Socket(options) {
} else if (options.fd !== undefined) {
this._handle = createHandle(options.fd);
this._handle.open(options.fd);
if ((options.fd == 1 || options.fd == 2) &&
(this._handle instanceof Pipe) &&
process.platform === 'win32') {
// Make stdout and stderr blocking on Windows
// this._handle.open() puts the file descriptor in non-blocking
// mode but it must be synchronous for backwards compatibility.
if ((options.fd == 1 || options.fd == 2) && this._handle instanceof Pipe) {
var err = this._handle.setBlocking(true);
if (err)
throw errnoException(err, 'setBlocking');
Expand Down
23 changes: 23 additions & 0 deletions test/parallel/test-child-process-sync-process-send.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
var common = require('../common');
var assert = require('assert');
var fork = require('child_process').fork;
var N = 4 << 20; // 4 MB

for (var big = '*'; big.length < N; big += big);

if (process.argv[2] === 'child') {
process.send(big);
process.exit(42);
}

var proc = fork(__filename, ['child']);

proc.on('message', common.mustCall(function(msg) {
assert.equal(typeof msg, 'string');
assert.equal(msg.length, N);
assert.equal(msg, big);
}));

proc.on('exit', common.mustCall(function(exitCode) {
assert.equal(exitCode, 42);
}));
23 changes: 23 additions & 0 deletions test/parallel/test-net-sync-stdio.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
var common = require('../common');
var assert = require('assert');
var spawn = require('child_process').spawn;
var N = 4 << 20; // 4 MB

for (var big = '*'; big.length < N; big += big);

if (process.argv[2] === 'child') {
process.stdout.write(big);
process.exit(42);
}

var stdio = ['inherit', 'pipe', 'inherit'];
var proc = spawn(process.execPath, [__filename, 'child'], { stdio: stdio });

var chunks = [];
proc.stdout.setEncoding('utf8');
proc.stdout.on('data', chunks.push.bind(chunks));

proc.on('exit', common.mustCall(function(exitCode) {
assert.equal(exitCode, 42);
assert.equal(chunks.join(''), big);
}));

0 comments on commit 1fea458

Please sign in to comment.