From def344b4972f809961af8c2f1cae49cb725e86c1 Mon Sep 17 00:00:00 2001 From: Brian White Date: Tue, 13 Jun 2017 01:01:52 -0400 Subject: [PATCH] child_process: remove nextTick on IPC message --- lib/internal/child_process.js | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js index 25190277e2e076..f74fdc673a2652 100644 --- a/lib/internal/child_process.js +++ b/lib/internal/child_process.js @@ -456,7 +456,6 @@ function setupChannel(target, channel) { } chunks[0] = jsonBuffer + chunks[0]; - var nextTick = false; for (var i = 0; i < numCompleteChunks; i++) { var message = JSON.parse(chunks[i]); @@ -465,12 +464,11 @@ function setupChannel(target, channel) { // that we deliver the handle with the right message however. if (isInternal(message)) { if (message.cmd === 'NODE_HANDLE') - handleMessage(message, recvHandle, true, false); + handleMessage(message, recvHandle, true); else - handleMessage(message, undefined, true, false); + handleMessage(message, undefined, true); } else { - handleMessage(message, undefined, false, nextTick); - nextTick = true; + handleMessage(message, undefined, false); } } jsonBuffer = incompleteChunk; @@ -532,7 +530,7 @@ function setupChannel(target, channel) { // Convert handle object obj.got.call(this, message, handle, function(handle) { - handleMessage(message.msg, handle, isInternal(message.msg), false); + handleMessage(message.msg, handle, isInternal(message.msg)); }); }); @@ -738,19 +736,12 @@ function setupChannel(target, channel) { process.nextTick(finish); }; - function emit(event, message, handle) { - target.emit(event, message, handle); - } - - function handleMessage(message, handle, internal, nextTick) { + function handleMessage(message, handle, internal) { if (!target.channel) return; var eventName = (internal ? 'internalMessage' : 'message'); - if (nextTick) - process.nextTick(emit, eventName, message, handle); - else - target.emit(eventName, message, handle); + target.emit(eventName, message, handle); } channel.readStart();