diff options
author | Anna Henningsen <anna@addaleax.net> | 2019-11-02 18:58:24 +0100 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2019-11-06 23:26:02 +0100 |
commit | 55f98df303939774639bb597c6392c1c85bae6dd (patch) | |
tree | 8f86617435693e211ea90d943c20703957acdf72 | |
parent | 4aca277f16b8649b5fc21d41f340fad0a47c2e61 (diff) | |
download | android-node-v8-55f98df303939774639bb597c6392c1c85bae6dd.tar.gz android-node-v8-55f98df303939774639bb597c6392c1c85bae6dd.tar.bz2 android-node-v8-55f98df303939774639bb597c6392c1c85bae6dd.zip |
src: track no of active JS signal handlers
This makes it possible to tell whether a signal is being tracked in JS.
PR-URL: https://github.com/nodejs/node/pull/30229
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
-rw-r--r-- | src/node_internals.h | 2 | ||||
-rw-r--r-- | src/signal_wrap.cc | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/src/node_internals.h b/src/node_internals.h index 055042377c..07e49edd41 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -322,6 +322,8 @@ void EndStartedProfilers(Environment* env); } #endif // HAVE_INSPECTOR +bool HasSignalJSHandler(int signum); + #ifdef _WIN32 typedef SYSTEMTIME TIME_TYPE; #else // UNIX, OSX diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc index 90b91f35a8..cf67dc590f 100644 --- a/src/signal_wrap.cc +++ b/src/signal_wrap.cc @@ -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 |