1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

child_process: optimize IPC for large data

Browse Source 
Squashed from:
- child_process: stop indexOf() on whole IPC buffer
- child_process: get rid of forEach() and slice() in IPC
- child_process: get rid of another forEach() in IPC

Fixes: https://github.com/nodejs/node/issues/3145
PR-URL: https://github.com/nodejs/node/pull/10557
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Yuya Tanaka 2017-01-01 01:09:52 +09:00 committed by Anna Henningsen
parent 1216a34590
commit 92eadd3037
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/internal/child_process.js
View File

@ -446,14 +446,20 @@ function setupChannel(target, channel) {
channel.onread = function(nread, pool, recvHandle) { channel.onread = function(nread, pool, recvHandle) {
// TODO(bnoordhuis) Check that nread > 0. // TODO(bnoordhuis) Check that nread > 0.
if (pool) { if (pool) {
jsonBuffer += decoder.write(pool); // Linebreak is used as a message end sign
var chunks = decoder.write(pool).split('\n');
var numCompleteChunks = chunks.length - 1;
// Last line does not have trailing linebreak
var incompleteChunk = chunks[numCompleteChunks];
if (numCompleteChunks === 0) {
jsonBuffer += incompleteChunk;
this.buffering = jsonBuffer.length !== 0;
return;
}
chunks[0] = jsonBuffer + chunks[0];
var i, start = 0; for (var i = 0; i < numCompleteChunks; i++) {
var message = JSON.parse(chunks[i]);
//Linebreak is used as a message end sign
while ((i = jsonBuffer.indexOf('\n', start)) >= 0) {
var json = jsonBuffer.slice(start, i);
var message = JSON.parse(json);
// There will be at most one NODE_HANDLE message in every chunk we // There will be at most one NODE_HANDLE message in every chunk we
// read because SCM_RIGHTS messages don't get coalesced. Make sure // read because SCM_RIGHTS messages don't get coalesced. Make sure
@ -462,10 +468,8 @@ function setupChannel(target, channel) {
handleMessage(target, message, recvHandle); handleMessage(target, message, recvHandle);
else else
handleMessage(target, message, undefined); handleMessage(target, message, undefined);
start = i + 1;
} }
jsonBuffer = jsonBuffer.slice(start); jsonBuffer = incompleteChunk;
this.buffering = jsonBuffer.length !== 0; this.buffering = jsonBuffer.length !== 0;
} else { } else {
@ -494,9 +498,10 @@ function setupChannel(target, channel) {
var queue = target._handleQueue; var queue = target._handleQueue;
target._handleQueue = null; target._handleQueue = null;
queue.forEach(function(args) { for (var i = 0; i < queue.length; i++) {
var args = queue[i];
target._send(args.message, args.handle, args.options, args.callback); target._send(args.message, args.handle, args.options, args.callback);
}); }
// Process a pending disconnect (if any). // Process a pending disconnect (if any).
if (!target.connected && target.channel && !target._handleQueue) if (!target.connected && target.channel && !target._handleQueue)