process: setup signal handler in prepareMainThreadExecution

Because this is only necessary in the main thread. Also removes the rearming of signal events since no signal event handlers should be created during the execution of node.js now that we've made the creation of stdout and stderr streams lazy - this has been demonstrated in the test coverage. PR-URL: #26227 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Feb 25, 2019 · a2a7adc · a2a7adc
1 parent 2cda691
commit a2a7adc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -320,36 +320,15 @@ if (process.env.NODE_V8_COVERAGE) {
   };
 }
 
-// Worker threads don't receive signals.
-if (isMainThread) {
-  const {
-    isSignal,
-    startListeningIfSignal,
-    stopListeningIfSignal
-  } = mainThreadSetup.createSignalHandlers();
-  process.on('newListener', startListeningIfSignal);
-  process.on('removeListener', stopListeningIfSignal);
-  // re-arm pre-existing signal event registrations
-  // with this signal wrap capabilities.
-  const signalEvents = process.eventNames().filter(isSignal);
-  for (const ev of signalEvents) {
-    process.emit('newListener', ev);
-  }
-}
-
 if (getOptionValue('--experimental-report')) {
   const {
     config,
-    handleSignal,
     report,
     syncConfig
   } = NativeModule.require('internal/process/report');
   process.report = report;
   // Download the CLI / ENV config into JS land.
   syncConfig(config, false);
-  if (config.events.includes('signal')) {
-    process.on(config.signal, handleSignal);
-  }
 }
 
 function setupProcessObject() {

diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -8,6 +8,9 @@ let traceEventsAsyncHook;
 function prepareMainThreadExecution() {
   setupTraceCategoryState();
 
+  // Only main thread receives signals.
+  setupSignalHandlers();
+
   // 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:
@@ -28,6 +31,28 @@ function prepareMainThreadExecution() {
   loadPreloadModules();
 }
 
+function setupSignalHandlers() {
+  const {
+    createSignalHandlers
+  } = require('internal/process/main_thread_only');
+  const {
+    startListeningIfSignal,
+    stopListeningIfSignal
+  } = createSignalHandlers();
+  process.on('newListener', startListeningIfSignal);
+  process.on('removeListener', stopListeningIfSignal);
+
+  if (getOptionValue('--experimental-report')) {
+    const {
+      config,
+      handleSignal
+    } = require('internal/process/report');
+    if (config.events.includes('signal')) {
+      process.on(config.signal, handleSignal);
+    }
+  }
+}
+
 function setupTraceCategoryState() {
   const {
     asyncHooksEnabledInitial,

diff --git a/lib/internal/process/main_thread_only.js b/lib/internal/process/main_thread_only.js
@@ -144,7 +144,6 @@ function createSignalHandlers() {
   }
 
   return {
-    isSignal,
     startListeningIfSignal,
     stopListeningIfSignal
   };