Skip to content
Permalink
Browse files

process: move child process IPC setup condition into node.js

Instead of branching in main_thread_only.js, move the branch on
process.env.NODE_CHANNEL_FD in node.js so it's easier to tell when
this needs to happen. Also added comments about what side effect
this causes, and lazy load `assert`.

PR-URL: #25130
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information...
joyeecheung authored and addaleax committed Dec 19, 2018
1 parent 19f1a50 commit 6b5c962a0a3f878727a12f7c9e0fa40a1178fcf9
Showing with 14 additions and 13 deletions.
  1. +6 −1 lib/internal/bootstrap/node.js
  2. +8 −12 lib/internal/process/main_thread_only.js
@@ -129,7 +129,12 @@ function startup() {
return;
}

if (isMainThread) {
// If the process is spawned with env NODE_CHANNEL_FD, it's probably
// spawned by our child_process module, then initialize IPC.
// This attaches some internal event listeners and creates:
// process.send(), process.channel, process.connected,
// process.disconnect()
if (isMainThread && process.env.NODE_CHANNEL_FD) {
mainThreadSetup.setupChildProcessIpcChannel();
}

@@ -21,8 +21,6 @@ const {
getMainThreadStdio
} = require('internal/process/stdio');

const assert = require('assert').strict;

function setupStdio() {
setupProcessStdio(getMainThreadStdio());
}
@@ -159,18 +157,16 @@ function setupSignalHandlers(internalBinding) {
}

function setupChildProcessIpcChannel() {
// If we were spawned with env NODE_CHANNEL_FD then load that up and
// start parsing data from that stream.
if (process.env.NODE_CHANNEL_FD) {
const fd = parseInt(process.env.NODE_CHANNEL_FD, 10);
assert(fd >= 0);
const assert = require('assert').strict;

// Make sure it's not accidentally inherited by child processes.
delete process.env.NODE_CHANNEL_FD;
const fd = parseInt(process.env.NODE_CHANNEL_FD, 10);
assert(fd >= 0);

require('child_process')._forkChild(fd);
assert(process.send);
}
// Make sure it's not accidentally inherited by child processes.
delete process.env.NODE_CHANNEL_FD;

require('child_process')._forkChild(fd);
assert(process.send);
}

module.exports = {

0 comments on commit 6b5c962

Please sign in to comment.
You can’t perform that action at this time.