diff options
author | Anatoli Papirovski <apapirovski@mac.com> | 2018-06-06 16:32:51 -0400 |
---|---|---|
committer | Anatoli Papirovski <apapirovski@mac.com> | 2018-06-09 19:09:46 -0700 |
commit | 9788da962e4860b848bcfe1bcd15b76b0f7eedd8 (patch) | |
tree | e8f90a287663e65298bebff7597b790504b1b196 /src | |
parent | d6bdfacf6cad907067dd3b6dd59f849cfc9d2b24 (diff) | |
download | android-node-v8-9788da962e4860b848bcfe1bcd15b76b0f7eedd8.tar.gz android-node-v8-9788da962e4860b848bcfe1bcd15b76b0f7eedd8.tar.bz2 android-node-v8-9788da962e4860b848bcfe1bcd15b76b0f7eedd8.zip |
src: do not persist fs_poll handle in stat_watcher
Instead of relying on garbage collection to close the handle,
manage its state more explicitly.
PR-URL: https://github.com/nodejs/node/pull/21093
Fixes: https://github.com/nodejs/node/issues/18190
Refs: https://github.com/nodejs/node/pull/18307
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/node_stat_watcher.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc index 3f7da197b2..0409cfbfb5 100644 --- a/src/node_stat_watcher.cc +++ b/src/node_stat_watcher.cc @@ -77,19 +77,15 @@ void StatWatcher::Initialize(Environment* env, Local<Object> target) { StatWatcher::StatWatcher(Environment* env, Local<Object> wrap, bool use_bigint) : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_STATWATCHER), - watcher_(new uv_fs_poll_t), + watcher_(nullptr), use_bigint_(use_bigint) { MakeWeak(); - uv_fs_poll_init(env->event_loop(), watcher_); - watcher_->data = static_cast<void*>(this); } StatWatcher::~StatWatcher() { - if (IsActive()) { + if (IsActive()) Stop(); - } - env()->CloseHandle(watcher_, [](uv_fs_poll_t* handle) { delete handle; }); } @@ -123,7 +119,7 @@ void StatWatcher::New(const FunctionCallbackInfo<Value>& args) { } bool StatWatcher::IsActive() { - return uv_is_active(reinterpret_cast<uv_handle_t*>(watcher_)) != 0; + return watcher_ != nullptr; } void StatWatcher::IsActive(const v8::FunctionCallbackInfo<v8::Value>& args) { @@ -156,6 +152,9 @@ void StatWatcher::Start(const FunctionCallbackInfo<Value>& args) { CHECK(args[2]->IsUint32()); const uint32_t interval = args[2].As<Uint32>()->Value(); + wrap->watcher_ = new uv_fs_poll_t(); + CHECK_EQ(0, uv_fs_poll_init(wrap->env()->event_loop(), wrap->watcher_)); + wrap->watcher_->data = static_cast<void*>(wrap); // Safe, uv_ref/uv_unref are idempotent. if (persistent) uv_ref(reinterpret_cast<uv_handle_t*>(wrap->watcher_)); @@ -187,7 +186,8 @@ void StatWatcher::Stop(const FunctionCallbackInfo<Value>& args) { void StatWatcher::Stop() { - uv_fs_poll_stop(watcher_); + env()->CloseHandle(watcher_, [](uv_fs_poll_t* handle) { delete handle; }); + watcher_ = nullptr; MakeWeak(); } |