perf_hooks: fix scheduling regression

Scheduling a PerformanceGCCallback should not keep the loop alive but due to the recent switch to using the native SetImmediate method, it does. Go back to using uv_async_t and add a regression test. PR-URL: #18051 Fixes: #18047 Refs: #18020 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Jun 14, 2018 · 02496fd · 02496fd
1 parent f8efa8e
commit 02496fd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/node_perf.cc b/src/node_perf.cc
@@ -184,8 +184,9 @@ void SetupPerformanceObservers(const FunctionCallbackInfo<Value>& args) {
 }
 
 // Creates a GC Performance Entry and passes it to observers
-void PerformanceGCCallback(Environment* env, void* ptr) {
-  GCPerformanceEntry* entry = static_cast<GCPerformanceEntry*>(ptr);
+void PerformanceGCCallback(uv_async_t* handle) {
+  GCPerformanceEntry* entry = static_cast<GCPerformanceEntry*>(handle->data);
+  Environment* env = entry->env();
   HandleScope scope(env->isolate());
   Local<Context> context = env->context();
 
@@ -203,6 +204,10 @@ void PerformanceGCCallback(Environment* env, void* ptr) {
   }
 
   delete entry;
+  auto closeCB = [](uv_handle_t* handle) {
+    delete reinterpret_cast<uv_async_t*>(handle);
+  };
+  uv_close(reinterpret_cast<uv_handle_t*>(handle), closeCB);
 }
 
 // Marks the start of a GC cycle
@@ -219,11 +224,16 @@ void MarkGarbageCollectionEnd(Isolate* isolate,
                               v8::GCCallbackFlags flags,
                               void* data) {
   Environment* env = static_cast<Environment*>(data);
-  env->SetImmediate(PerformanceGCCallback,
-                    new GCPerformanceEntry(env,
-                                           static_cast<PerformanceGCKind>(type),
-                                           performance_last_gc_start_mark_,
-                                           PERFORMANCE_NOW()));
+  uv_async_t* async = new uv_async_t();
+  if (uv_async_init(env->event_loop(), async, PerformanceGCCallback))
+    return delete async;
+  uv_unref(reinterpret_cast<uv_handle_t*>(async));
+  async->data =
+      new GCPerformanceEntry(env,
+                             static_cast<PerformanceGCKind>(type),
+                             performance_last_gc_start_mark_,
+                             PERFORMANCE_NOW());
+  CHECK_EQ(0, uv_async_send(async));
 }
 
 

diff --git a/test/parallel/test-performance-gc.js b/test/parallel/test-performance-gc.js
@@ -51,3 +51,13 @@ const kinds = [
   // Keep the event loop alive to witness the GC async callback happen.
   setImmediate(() => setImmediate(() => 0));
 }
+
+// GC should not keep the event loop alive
+{
+  let didCall = false;
+  process.on('beforeExit', () => {
+    assert(!didCall);
+    didCall = true;
+    global.gc();
+  });
+}