nodejs
diff --git a/‎src/node_internals.h‎
Lines changed: 2 additions & 0 deletions b/‎src/node_internals.h‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/signal_wrap.cc‎
Lines changed: 38 additions & 0 deletions b/‎src/signal_wrap.cc‎
Lines changed: 38 additions & 0 deletions
@@ -322,6 +322,8 @@ void EndStartedProfilers(Environment* env);
 }
 #endif  // HAVE_INSPECTOR
 
+bool HasSignalJSHandler(int signum);
+
 #ifdef _WIN32
 typedef SYSTEMTIME TIME_TYPE;
 #else  // UNIX, OSX
 
@@ -38,8 +38,13 @@ using v8::Object;
 using v8::String;
 using v8::Value;
 
+void DecreaseSignalHandlerCount(int signum);
+
 namespace {
 
+static Mutex handled_signals_mutex;
+static std::map<int, int64_t> handled_signals;  // Signal -> number of handlers
+
 class SignalWrap : public HandleWrap {
  public:
   static void Initialize(Local<Object> target,
@@ -85,6 +90,11 @@ class SignalWrap : public HandleWrap {
     CHECK_EQ(r, 0);
   }
 
+  void Close(v8::Local<v8::Value> close_callback) override {
+    if (active_) DecreaseSignalHandlerCount(handle_.signum);
+    HandleWrap::Close(close_callback);
+  }
+
   static void Start(const FunctionCallbackInfo<Value>& args) {
     SignalWrap* wrap;
     ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
@@ -112,21 +122,49 @@ class SignalWrap : public HandleWrap {
           wrap->MakeCallback(env->onsignal_string(), 1, &arg);
         },
         signum);
+
+    if (err == 0) {
+      CHECK(!wrap->active_);
+      wrap->active_ = true;
+      Mutex::ScopedLock lock(handled_signals_mutex);
+      handled_signals[signum]++;
+    }
+
     args.GetReturnValue().Set(err);
   }
 
   static void Stop(const FunctionCallbackInfo<Value>& args) {
     SignalWrap* wrap;
     ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
+
+    if (wrap->active_)  {
+      wrap->active_ = false;
+      DecreaseSignalHandlerCount(wrap->handle_.signum);
+    }
+
     int err = uv_signal_stop(&wrap->handle_);
     args.GetReturnValue().Set(err);
   }
 
   uv_signal_t handle_;
+  bool active_ = false;
 };
 
 
 }  // anonymous namespace
+
+void DecreaseSignalHandlerCount(int signum) {
+  Mutex::ScopedLock lock(handled_signals_mutex);
+  int new_handler_count = --handled_signals[signum];
+  CHECK_GE(new_handler_count, 0);
+  if (new_handler_count == 0)
+    handled_signals.erase(signum);
+}
+
+bool HasSignalJSHandler(int signum) {
+  Mutex::ScopedLock lock(handled_signals_mutex);
+  return handled_signals.find(signum) != handled_signals.end();
+}
 }  // namespace node
Original file line number	Diff line number	Diff line change
@@ -322,6 +322,8 @@ void EndStartedProfilers(Environment* env);
322	322	}
323	323	#endif // HAVE_INSPECTOR
324	324
	325	+ bool HasSignalJSHandler(int signum);
	326	+
325	327	#ifdef _WIN32
326	328	typedef SYSTEMTIME TIME_TYPE;
327	329	#else // UNIX, OSX