perf_hooks: deduplicate histogram Start/Stop via shared templates

Added shared templates for duplicated start/stop
logic in IntevalHistogram and IterationHistogram.

Author: pabloerhard

src/env_properties.h

@@ -434,7 +434,7 @@
   V(http2ping_constructor_template, v8::ObjectTemplate)                        \
   V(i18n_converter_template, v8::ObjectTemplate)                               \
   V(intervalhistogram_constructor_template, v8::FunctionTemplate)              \
-  V(iterationhistogram_constructor_template, v8::FunctionTemplate)                   \
+  V(iterationhistogram_constructor_template, v8::FunctionTemplate)             \
   V(iter_template, v8::DictionaryTemplate)                                     \
   V(js_transferable_constructor_template, v8::FunctionTemplate)                \
   V(libuv_stream_wrap_ctor_template, v8::FunctionTemplate)                     \

src/histogram.cc

@@ -25,6 +25,20 @@ using v8::String;
 using v8::Uint32;
 using v8::Value;
 
+template <typename T>
+void StartHandleHistogram(Local<Value> receiver, bool reset) {
+  T* histogram;
+  ASSIGN_OR_RETURN_UNWRAP(&histogram, receiver);
+  histogram->OnStart(reset ? T::StartFlags::RESET : T::StartFlags::NONE);
+}
+
+template <typename T>
+void StopHandleHistogram(Local<Value> receiver) {
+  T* histogram;
+  ASSIGN_OR_RETURN_UNWRAP(&histogram, receiver);
+  histogram->OnStop();
+}
+
 Histogram::Histogram(const Options& options) {
   hdr_histogram* histogram;
   CHECK_EQ(0, hdr_init(options.lowest,
@@ -423,32 +437,25 @@ void IntervalHistogram::OnStop() {
 }
 
 void IntervalHistogram::Start(const FunctionCallbackInfo<Value>& args) {
-  IntervalHistogram* histogram;
-  ASSIGN_OR_RETURN_UNWRAP(&histogram, args.This());
-  histogram->OnStart(args[0]->IsTrue() ? StartFlags::RESET : StartFlags::NONE);
+  StartHandleHistogram<IntervalHistogram>(args.This(), args[0]->IsTrue());
 }
 
 void IntervalHistogram::FastStart(Local<Value> receiver, bool reset) {
   TRACK_V8_FAST_API_CALL("histogram.start");
-  IntervalHistogram* histogram;
-  ASSIGN_OR_RETURN_UNWRAP(&histogram, receiver);
-  histogram->OnStart(reset ? StartFlags::RESET : StartFlags::NONE);
+  StartHandleHistogram<IntervalHistogram>(receiver, reset);
 }
 
 void IntervalHistogram::Stop(const FunctionCallbackInfo<Value>& args) {
-  IntervalHistogram* histogram;
-  ASSIGN_OR_RETURN_UNWRAP(&histogram, args.This());
-  histogram->OnStop();
+  StopHandleHistogram<IntervalHistogram>(args.This());
 }
 
 void IntervalHistogram::FastStop(Local<Value> receiver) {
   TRACK_V8_FAST_API_CALL("histogram.stop");
-  IntervalHistogram* histogram;
-  ASSIGN_OR_RETURN_UNWRAP(&histogram, receiver);
-  histogram->OnStop();
+  StopHandleHistogram<IntervalHistogram>(receiver);
 }
 
-Local<FunctionTemplate> IterationHistogram::GetConstructorTemplate(Environment* env) {
+Local<FunctionTemplate> IterationHistogram::GetConstructorTemplate(
+    Environment* env) {
   Local<FunctionTemplate> tmpl = env->iterationhistogram_constructor_template();
   if (tmpl.IsEmpty()) {
     Isolate* isolate = env->isolate();
@@ -515,7 +522,8 @@ void IterationHistogram::PrepareCB(uv_prepare_t* handle) {
 }
 
 void IterationHistogram::CheckCB(uv_check_t* handle) {
-  IterationHistogram* self = ContainerOf(&IterationHistogram::check_handle_, handle);
+  IterationHistogram* self =
+      ContainerOf(&IterationHistogram::check_handle_, handle);
   if (!self->enabled_) return;
 
   uint64_t check_time = uv_hrtime();
@@ -565,29 +573,21 @@ void IterationHistogram::Close(Local<Value> close_callback) {
 }
 
 void IterationHistogram::Start(const FunctionCallbackInfo<Value>& args) {
-  IterationHistogram* histogram;
-  ASSIGN_OR_RETURN_UNWRAP(&histogram, args.This());
-  histogram->OnStart(args[0]->IsTrue() ? StartFlags::RESET : StartFlags::NONE);
+  StartHandleHistogram<IterationHistogram>(args.This(), args[0]->IsTrue());
 }
 
 void IterationHistogram::FastStart(Local<Value> receiver, bool reset) {
   TRACK_V8_FAST_API_CALL("histogram.eventLoopDelay.start");
-  IterationHistogram* histogram;
-  ASSIGN_OR_RETURN_UNWRAP(&histogram, receiver);
-  histogram->OnStart(reset ? StartFlags::RESET : StartFlags::NONE);
+  StartHandleHistogram<IterationHistogram>(receiver, reset);
 }
 
 void IterationHistogram::Stop(const FunctionCallbackInfo<Value>& args) {
-  IterationHistogram* histogram;
-  ASSIGN_OR_RETURN_UNWRAP(&histogram, args.This());
-  histogram->OnStop();
+  StopHandleHistogram<IterationHistogram>(args.This());
 }
 
 void IterationHistogram::FastStop(Local<Value> receiver) {
   TRACK_V8_FAST_API_CALL("histogram.eventLoopDelay.stop");
-  IterationHistogram* histogram;
-  ASSIGN_OR_RETURN_UNWRAP(&histogram, receiver);
-  histogram->OnStop();
+  StopHandleHistogram<IterationHistogram>(receiver);
 }
 
 void HistogramImpl::GetCount(const FunctionCallbackInfo<Value>& args) {
@@ -753,7 +753,8 @@ HistogramImpl* HistogramImpl::FromJSObject(Local<Value> value) {
       HistogramImpl::kImplField, EmbedderDataTag::kDefault));
 }
 
-std::unique_ptr<worker::TransferData> IterationHistogram::CloneForMessaging() const {
+std::unique_ptr<worker::TransferData> IterationHistogram::CloneForMessaging()
+    const {
   return std::make_unique<HistogramBase::HistogramTransferData>(histogram());
 }
 

src/histogram.h

@@ -20,6 +20,11 @@ namespace node {
 
 class ExternalReferenceRegistry;
 
+template <typename T>
+void StartHandleHistogram(v8::Local<v8::Value> receiver, bool reset);
+template <typename T>
+void StopHandleHistogram(v8::Local<v8::Value> receiver);
+
 constexpr int kDefaultHistogramFigures = 3;
 
 class Histogram : public MemoryRetainer {
@@ -257,6 +262,11 @@ class IntervalHistogram final : public HandleWrap, public HistogramImpl {
   void OnStart(StartFlags flags = StartFlags::RESET);
   void OnStop();
 
+  template <typename T>
+  friend void StartHandleHistogram(v8::Local<v8::Value>, bool);
+  template <typename T>
+  friend void StopHandleHistogram(v8::Local<v8::Value>);
+
   bool enabled_ = false;
   int32_t interval_ = 0;
   std::function<void(Histogram&)> on_interval_;
@@ -312,6 +322,11 @@ class IterationHistogram final : public HandleWrap, public HistogramImpl {
   void OnStart(StartFlags flags = StartFlags::RESET);
   void OnStop();
 
+  template <typename T>
+  friend void StartHandleHistogram(v8::Local<v8::Value>, bool);
+  template <typename T>
+  friend void StopHandleHistogram(v8::Local<v8::Value>);
+
   bool enabled_ = false;
   uv_prepare_t prepare_handle_;
   uv_check_t check_handle_;

src/node_task_queue.cc

@@ -76,9 +76,11 @@ void PromiseRejectCallback(PromiseRejectMessage message) {
     value = Undefined(isolate);
     rejectionsHandledAfter++;
     TRACE_COUNTER2(TRACING_CATEGORY_NODE2(promises, rejections),
-                  "rejections",
-                  "unhandled", unhandledRejections,
-                  "handledAfter", rejectionsHandledAfter);
+                   "rejections",
+                   "unhandled",
+                   unhandledRejections,
+                   "handledAfter",
+                   rejectionsHandledAfter);
   } else {
     return;
   }