Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from

Conversation

@joyeecheung
Copy link
Member

commented Dec 19, 2018

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.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
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`.
@joyeecheung

This comment has been minimized.

Copy link
Member Author

commented Dec 19, 2018

@Fishrock123

This comment has been minimized.

Copy link
Member

commented Dec 19, 2018

CI on MacOS 10.11:

11:13:16 not ok 1898 parallel/test-tls-net-socket-keepalive
11:13:16   ---
11:13:16   duration_ms: 0.274
11:13:16   severity: fail
11:13:16   exitcode: 1
11:13:16   stack: |-
11:13:16     Mismatched noop function calls. Expected exactly 1, actual 0.
11:13:16         at Object.mustCall (/Users/iojs/build/workspace/node-test-commit-osx/nodes/osx1011/test/common/index.js:339:10)
11:13:16         at Server.tls.createServer.listen.common.mustCall (/Users/iojs/build/workspace/node-test-commit-osx/nodes/osx1011/test/parallel/test-tls-net-socket-keepalive.js:45:27)
11:13:16         at Server.<anonymous> (/Users/iojs/build/workspace/node-test-commit-osx/nodes/osx1011/test/common/index.js:373:15)
11:13:16         at Object.onceWrapper (events.js:277:13)
11:13:16         at Server.emit (events.js:189:13)
11:13:16         at emitListeningNT (net.js:1289:10)
11:13:16         at internalTickCallback (internal/process/next_tick.js:72:19)
11:13:16         at process._tickCallback (internal/process/next_tick.js:47:5)
11:13:16         at Function.Module.runMain (internal/modules/cjs/loader.js:774:11)
if (process.env.NODE_CHANNEL_FD) {
const fd = parseInt(process.env.NODE_CHANNEL_FD, 10);
assert(fd >= 0);
const assert = require('assert').ok;

This comment has been minimized.

Copy link
@BridgeAR

BridgeAR Dec 20, 2018

Member

Nit: strict was correct. Otherwise there's no need to access ok as it's the same property as the one exported by default.

@lpinca
lpinca approved these changes Dec 20, 2018
@joyeecheung

This comment has been minimized.

Copy link
Member Author

commented Dec 20, 2018

@joyeecheung

This comment has been minimized.

Copy link
Member Author

commented Dec 22, 2018

Landed in 0c1a388

joyeecheung added a commit that referenced this pull request Dec 22, 2018
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>
@MylesBorins

This comment has been minimized.

Copy link
Member

commented Dec 25, 2018

This doesn't land cleanly on v11.x, should it be backported?

@targos targos added this to Backport requested in v11.x Dec 28, 2018

refack added a commit to refack/node that referenced this pull request Jan 14, 2019
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: nodejs#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>
addaleax added a commit that referenced this pull request Jan 14, 2019
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>
@addaleax

This comment has been minimized.

Copy link
Member

commented Jan 14, 2019

This applies cleanly now.

@BridgeAR BridgeAR moved this from Backport requested to Backported in v11.x Jan 14, 2019

@BridgeAR BridgeAR referenced this pull request Jan 16, 2019
BridgeAR added a commit to BridgeAR/node that referenced this pull request Jan 16, 2019
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: nodejs#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>
@MylesBorins MylesBorins referenced this pull request Jan 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
8 participants
You can’t perform that action at this time.