1 files changed, 27 insertions, 26 deletions

diff --git a/lib/internal/process/main_thread_only.js b/lib/internal/process/main_thread_only.js
index 42579e9da8..290d2f7e9e 100644
--- a/lib/internal/process/main_thread_only.js
+++ b/lib/internal/process/main_thread_only.js
@@ -16,6 +16,8 @@ const {
   validateString
 } = require('internal/validators');
 
+const { signals } = internalBinding('constants').os;
+
 // The execution of this function itself should not cause any side effects.
 function wrapProcessMethods(binding) {
   function chdir(directory) {
@@ -104,19 +106,18 @@ function wrapPosixCredentialSetters(credentials) {
   };
 }
 
-// Worker threads don't receive signals.
-function setupSignalHandlers(internalBinding) {
-  const constants = internalBinding('constants').os.signals;
-  const signalWraps = Object.create(null);
-  let Signal;
+let Signal;
+function isSignal(event) {
+  return typeof event === 'string' && signals[event] !== undefined;
+}
 
-  function isSignal(event) {
-    return typeof event === 'string' && constants[event] !== undefined;
-  }
+// Worker threads don't receive signals.
+function createSignalHandlers() {
+  const signalWraps = new Map();
 
   // Detect presence of a listener for the special signal types
-  process.on('newListener', function(type) {
-    if (isSignal(type) && signalWraps[type] === undefined) {
+  function startListeningIfSignal(type) {
+    if (isSignal(type) && !signalWraps.has(type)) {
       if (Signal === undefined)
         Signal = internalBinding('signal_wrap').Signal;
       const wrap = new Signal();
@@ -125,30 +126,30 @@ function setupSignalHandlers(internalBinding) {
 
       wrap.onsignal = process.emit.bind(process, type, type);
 
-      const signum = constants[type];
+      const signum = signals[type];
       const err = wrap.start(signum);
       if (err) {
         wrap.close();
         throw errnoException(err, 'uv_signal_start');
       }
 
-      signalWraps[type] = wrap;
+      signalWraps.set(type, wrap);
     }
-  });
+  }
 
-  process.on('removeListener', function(type) {
-    if (signalWraps[type] !== undefined && this.listenerCount(type) === 0) {
-      signalWraps[type].close();
-      delete signalWraps[type];
+  function stopListeningIfSignal(type) {
+    const wrap = signalWraps.get(type);
+    if (wrap !== undefined && process.listenerCount(type) === 0) {
+      wrap.close();
+      signalWraps.delete(type);
     }
-  });
-
-  // re-arm pre-existing signal event registrations
-  // with this signal wrap capabilities.
-  process.eventNames().forEach((ev) => {
-    if (isSignal(ev))
-      process.emit('newListener', ev);
-  });
+  }
+
+  return {
+    isSignal,
+    startListeningIfSignal,
+    stopListeningIfSignal
+  };
 }
 
 function setupChildProcessIpcChannel() {
@@ -166,7 +167,7 @@ function setupChildProcessIpcChannel() {
 
 module.exports = {
   wrapProcessMethods,
-  setupSignalHandlers,
+  createSignalHandlers,
   setupChildProcessIpcChannel,
   wrapPosixCredentialSetters
 };