From 475c43c1b006e186036817c364dfc24a4d12c44f Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Fri, 1 Feb 2019 01:04:44 +0800 Subject: perf_hooks: only enable GC tracking when it's requested Previously a GC prologue callback and a GC epilogue callback are always unconditionally enabled during bootstrap when the `performance` binding is loaded, even when the user does not use the performance timeline API to enable GC tracking. This patch makes the callback addition conditional and only enables them when the user explicitly requests `observer.observe(['gc'])` to avoid the overhead. PR-URL: https://github.com/nodejs/node/pull/25853 Reviewed-By: Anna Henningsen Reviewed-By: Gus Caplan Reviewed-By: James M Snell --- src/node_perf.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/node_perf.cc') diff --git a/src/node_perf.cc b/src/node_perf.cc index cefd0ff26d..33dd1d2051 100644 --- a/src/node_perf.cc +++ b/src/node_perf.cc @@ -296,8 +296,10 @@ void MarkGarbageCollectionEnd(Isolate* isolate, entry); } +static void SetupGarbageCollectionTracking( + const FunctionCallbackInfo& args) { + Environment* env = Environment::GetCurrent(args); -inline void SetupGarbageCollectionTracking(Environment* env) { env->isolate()->AddGCPrologueCallback(MarkGarbageCollectionStart, static_cast(env)); env->isolate()->AddGCEpilogueCallback(MarkGarbageCollectionEnd, @@ -416,6 +418,8 @@ void Initialize(Local target, env->SetMethod(target, "markMilestone", MarkMilestone); env->SetMethod(target, "setupObservers", SetupPerformanceObservers); env->SetMethod(target, "timerify", Timerify); + env->SetMethod( + target, "setupGarbageCollectionTracking", SetupGarbageCollectionTracking); Local constants = Object::New(isolate); @@ -452,8 +456,6 @@ void Initialize(Local target, env->constants_string(), constants, attr).ToChecked(); - - SetupGarbageCollectionTracking(env); } } // namespace performance -- cgit v1.2.3