1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: do not persist fs_poll handle in stat_watcher

Browse Source 
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>
This commit is contained in:
Anatoli Papirovski 2018-06-06 16:32:51 -04:00
parent d6bdfacf6c
commit 9788da962e
No known key found for this signature in database
GPG Key ID: 614E2E1ABEB4B2C0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/node_stat_watcher.cc
View File

@ -77,20 +77,16 @@ void StatWatcher::Initialize(Environment* env, Local<Object> target) {
StatWatcher::StatWatcher(Environment* env, Local<Object> wrap, bool use_bigint) StatWatcher::StatWatcher(Environment* env, Local<Object> wrap, bool use_bigint)
: AsyncWrap(env, wrap, AsyncWrap::PROVIDER_STATWATCHER), : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_STATWATCHER),
watcher_(new uv_fs_poll_t), watcher_(nullptr),
use_bigint_(use_bigint) { use_bigint_(use_bigint) {
MakeWeak(); MakeWeak();
uv_fs_poll_init(env->event_loop(), watcher_);
watcher_->data = static_cast<void*>(this);
} }
StatWatcher::~StatWatcher() { StatWatcher::~StatWatcher() {
if (IsActive()) { if (IsActive())
Stop(); Stop();
} }
env()->CloseHandle(watcher_, [](uv_fs_poll_t* handle) { delete handle; });
}
void StatWatcher::Callback(uv_fs_poll_t* handle, void StatWatcher::Callback(uv_fs_poll_t* handle,
@ -123,7 +119,7 @@ void StatWatcher::New(const FunctionCallbackInfo<Value>& args) {
} }
bool StatWatcher::IsActive() { 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) { void StatWatcher::IsActive(const v8::FunctionCallbackInfo<v8::Value>& args) {
@ -156,6 +152,9 @@ void StatWatcher::Start(const FunctionCallbackInfo<Value>& args) {
CHECK(args[2]->IsUint32()); CHECK(args[2]->IsUint32());
const uint32_t interval = args[2].As<Uint32>()->Value(); 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. // Safe, uv_ref/uv_unref are idempotent.
if (persistent) if (persistent)
uv_ref(reinterpret_cast<uv_handle_t*>(wrap->watcher_)); uv_ref(reinterpret_cast<uv_handle_t*>(wrap->watcher_));
@ -187,7 +186,8 @@ void StatWatcher::Stop(const FunctionCallbackInfo<Value>& args) {
void StatWatcher::Stop() { void StatWatcher::Stop() {
uv_fs_poll_stop(watcher_); env()->CloseHandle(watcher_, [](uv_fs_poll_t* handle) { delete handle; });
watcher_ = nullptr;
MakeWeak(); MakeWeak();
} }