src: refactor TimerWrap lifetime management

Split `Stop(true)` and `Stop(false)` into separate methods since the actions performed by these are fully distinct. PR-URL: #34252 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Zeyu Yang <[email protected]> Reviewed-By: David Carlier <[email protected]>

Author: addaleax

src/timer_wrap.cc

@@ -12,13 +12,14 @@ TimerWrap::TimerWrap(Environment* env, const TimerCb& fn)
  timer_.data = this;
 }
 
-voidTimerWrap::Stop(bool close){
+voidTimerWrap::Stop(){
 if (timer_.data == nullptr) return;
 uv_timer_stop(&timer_);
-if (LIKELY(close)){
- timer_.data = nullptr;
- env_->CloseHandle(reinterpret_cast<uv_handle_t*>(&timer_), TimerClosedCb);
- }
+}
+
+voidTimerWrap::Close(){
+ timer_.data = nullptr;
+ env_->CloseHandle(reinterpret_cast<uv_handle_t*>(&timer_), TimerClosedCb);
 }
 
 voidTimerWrap::TimerClosedCb(uv_handle_t* handle){
@@ -54,13 +55,14 @@ TimerWrapHandle::TimerWrapHandle(
  env->AddCleanupHook(CleanupHook, this);
 }
 
-voidTimerWrapHandle::Stop(bool close){
-if (UNLIKELY(!close))
-return timer_->Stop(close);
+voidTimerWrapHandle::Stop(){
+return timer_->Stop();
+}
 
+voidTimerWrapHandle::Close(){
 if (timer_ != nullptr){
  timer_->env()->RemoveCleanupHook(CleanupHook, this);
- timer_->Stop();
+ timer_->Close();
  }
  timer_ = nullptr;
 }
@@ -80,13 +82,13 @@ void TimerWrapHandle::Update(uint64_t interval, uint64_t repeat){
  timer_->Update(interval, repeat);
 }
 
-voidTimerWrapHandle::CleanupHook(void* data){
-static_cast<TimerWrapHandle*>(data)->Stop();
-}
-
-voidTimerWrapHandle::MemoryInfo(node::MemoryTracker* tracker) const{
+voidTimerWrapHandle::MemoryInfo(MemoryTracker* tracker) const{
 if (timer_ != nullptr)
  tracker->TrackField("timer", *timer_);
 }
 
+voidTimerWrapHandle::CleanupHook(void* data){
+static_cast<TimerWrapHandle*>(data)->Close();
+}
+
 } // namespace node

src/timer_wrap.h

@@ -21,14 +21,15 @@ class TimerWrap final : public MemoryRetainer{
 
 inline Environment* env() const{return env_}
 
-// Completely stops the timer, making it no longer usable.
-voidStop(bool close = true);
+// Stop calling the timer callback.
+voidStop();
+// Render the timer unusable and delete this object.
+voidClose();
 
 // Starts / Restarts the Timer
 voidUpdate(uint64_t interval, uint64_t repeat = 0);
 
 voidRef();
-
 voidUnref();
 
 SET_NO_MEMORY_INFO();
@@ -55,15 +56,15 @@ class TimerWrapHandle : public MemoryRetainer{
 
 TimerWrapHandle(const TimerWrapHandle&) = delete;
 
-~TimerWrapHandle(){Stop()}
+~TimerWrapHandle(){Close()}
 
 voidUpdate(uint64_t interval, uint64_t repeat = 0);
 
 voidRef();
-
 voidUnref();
 
-voidStop(bool close = true);
+voidStop();
+voidClose();
 
 voidMemoryInfo(node::MemoryTracker* tracker) constoverride;
 
@@ -72,6 +73,7 @@ class TimerWrapHandle : public MemoryRetainer{
 
 private:
 staticvoidCleanupHook(void* data);
+
  TimerWrap* timer_;
 };