diff --git a/node.gyp b/node.gyp index d2337823a8860c..068a647e415ef0 100644 --- a/node.gyp +++ b/node.gyp @@ -642,6 +642,7 @@ 'src/tracing/trace_event_common.h', 'src/tracing/traced_value.h', 'src/timer_wrap.h', + 'src/timer_wrap-inl.h', 'src/tty_wrap.h', 'src/udp_wrap.h', 'src/util.h', diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index c4a3322c6d972f..fd9f514b9b6a7b 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -15,7 +15,7 @@ #include "node_process-inl.h" #include "node_url.h" #include "util-inl.h" -#include "timer_wrap.h" +#include "timer_wrap-inl.h" #include "v8-inspector.h" #include "v8-platform.h" diff --git a/src/timer_wrap-inl.h b/src/timer_wrap-inl.h new file mode 100644 index 00000000000000..d60ea15ade7078 --- /dev/null +++ b/src/timer_wrap-inl.h @@ -0,0 +1,32 @@ +#ifndef SRC_TIMER_WRAP_INL_H_ +#define SRC_TIMER_WRAP_INL_H_ + +#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS + +#include "timer_wrap.h" + +#include + +#include "env.h" +#include "uv.h" + +namespace node { + +template +inline TimerWrap::TimerWrap(Environment* env, Args&&... args) + : env_(env), fn_(std::forward(args)...) { + uv_timer_init(env->event_loop(), &timer_); + timer_.data = this; +} + +template +inline TimerWrapHandle::TimerWrapHandle(Environment* env, Args&&... args) { + timer_ = new TimerWrap(env, std::forward(args)...); + env->AddCleanupHook(CleanupHook, this); +} + +} // namespace node + +#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS + +#endif // SRC_TIMER_WRAP_INL_H_ diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc index 6660b8c958810c..2b4457df818b27 100644 --- a/src/timer_wrap.cc +++ b/src/timer_wrap.cc @@ -1,17 +1,12 @@ +#include "timer_wrap.h" // NOLINT(build/include_inline) +#include "timer_wrap-inl.h" + #include "env-inl.h" #include "memory_tracker-inl.h" -#include "timer_wrap.h" #include "uv.h" namespace node { -TimerWrap::TimerWrap(Environment* env, const TimerCb& fn) - : env_(env), - fn_(fn) { - uv_timer_init(env->event_loop(), &timer_); - timer_.data = this; -} - void TimerWrap::Stop() { if (timer_.data == nullptr) return; uv_timer_stop(&timer_); @@ -48,13 +43,6 @@ void TimerWrap::OnTimeout(uv_timer_t* timer) { t->fn_(); } -TimerWrapHandle::TimerWrapHandle( - Environment* env, - const TimerWrap::TimerCb& fn) { - timer_ = new TimerWrap(env, fn); - env->AddCleanupHook(CleanupHook, this); -} - void TimerWrapHandle::Stop() { if (timer_ != nullptr) return timer_->Stop(); diff --git a/src/timer_wrap.h b/src/timer_wrap.h index dbc23b442bea39..ac8f00f0d470f5 100644 --- a/src/timer_wrap.h +++ b/src/timer_wrap.h @@ -16,7 +16,9 @@ class TimerWrap final : public MemoryRetainer { public: using TimerCb = std::function; - TimerWrap(Environment* env, const TimerCb& fn); + template + explicit inline TimerWrap(Environment* env, Args&&... args); + TimerWrap(const TimerWrap&) = delete; inline Environment* env() const { return env_; } @@ -50,9 +52,8 @@ class TimerWrap final : public MemoryRetainer { class TimerWrapHandle : public MemoryRetainer { public: - TimerWrapHandle( - Environment* env, - const TimerWrap::TimerCb& fn); + template + explicit inline TimerWrapHandle(Environment* env, Args&&... args); TimerWrapHandle(const TimerWrapHandle&) = delete;