diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2016-04-26 13:32:44 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2016-04-27 16:27:28 +0200 |
commit | a58d4839af6dfcb493ead8771cbff21b5ef9f18d (patch) | |
tree | 6d926fbecebc2b091087824728f680a568ebb17c /src | |
parent | cad1a62d325b011887349687962700dfe7510525 (diff) | |
download | android-node-v8-a58d4839af6dfcb493ead8771cbff21b5ef9f18d.tar.gz android-node-v8-a58d4839af6dfcb493ead8771cbff21b5ef9f18d.tar.bz2 android-node-v8-a58d4839af6dfcb493ead8771cbff21b5ef9f18d.zip |
src: simplify handlewrap state tracking logic
This also updates the tests to expect that a closed handle has no
reference count.
PR-URL: https://github.com/nodejs/node/pull/6395
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/handle_wrap.cc | 8 | ||||
-rw-r--r-- | src/handle_wrap.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc index 85c8d9e921..b82449989d 100644 --- a/src/handle_wrap.cc +++ b/src/handle_wrap.cc @@ -35,10 +35,7 @@ void HandleWrap::Unref(const FunctionCallbackInfo<Value>& args) { void HandleWrap::Unrefed(const FunctionCallbackInfo<Value>& args) { HandleWrap* wrap = Unwrap<HandleWrap>(args.Holder()); - // XXX(bnoordhuis) It's debatable whether a nullptr wrap should count - // as having a reference count but it's compatible with the logic that - // it replaces. - args.GetReturnValue().Set(wrap == nullptr || !HasRef(wrap)); + args.GetReturnValue().Set(!HasRef(wrap)); } @@ -51,6 +48,9 @@ void HandleWrap::Close(const FunctionCallbackInfo<Value>& args) { if (!IsAlive(wrap)) return; + if (wrap->state_ != kInitialized) + return; + CHECK_EQ(false, wrap->persistent().IsEmpty()); uv_close(wrap->handle__, OnClose); wrap->state_ = kClosing; diff --git a/src/handle_wrap.h b/src/handle_wrap.h index fe3c5a8d9d..ef37cf9e34 100644 --- a/src/handle_wrap.h +++ b/src/handle_wrap.h @@ -38,15 +38,11 @@ class HandleWrap : public AsyncWrap { static void Unrefed(const v8::FunctionCallbackInfo<v8::Value>& args); static inline bool IsAlive(const HandleWrap* wrap) { - // XXX(bnoordhuis) It's debatable whether only kInitialized should - // count as alive but it's compatible with the check that it replaces. - return wrap != nullptr && wrap->state_ == kInitialized; + return wrap != nullptr && wrap->state_ != kClosed; } static inline bool HasRef(const HandleWrap* wrap) { - return wrap != nullptr && - wrap->state_ != kClosed && - uv_has_ref(wrap->GetHandle()); + return IsAlive(wrap) && uv_has_ref(wrap->GetHandle()); } inline uv_handle_t* GetHandle() const { return handle__; } |