From 406c024407b915f5267344f3af2f7f51b305bdba Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Wed, 29 Jan 2020 16:41:26 +0000
Subject: [PATCH 1/6] worker: add ability to take heap snapshot from parent
 thread

---
 doc/api/errors.md                             |  7 +-
 doc/api/worker_threads.md                     | 17 +++++
 lib/internal/errors.js                        |  1 +
 lib/internal/heap_utils.js                    | 41 +++++++++++
 lib/internal/worker.js                        | 12 +++
 lib/v8.js                                     | 37 +---------
 node.gyp                                      |  1 +
 src/async_wrap.h                              |  1 +
 src/env.h                                     |  3 +-
 src/heap_utils.cc                             | 73 ++++++++++---------
 src/node_internals.h                          | 10 +++
 src/node_worker.cc                            | 59 +++++++++++++++
 src/node_worker.h                             |  1 +
 test/common/heap.js                           | 11 ++-
 test/parallel/test-worker-heapdump-failure.js | 15 ++++
 test/pummel/test-worker-take-heapsnapshot.js  | 22 ++++++
 16 files changed, 233 insertions(+), 78 deletions(-)
 create mode 100644 lib/internal/heap_utils.js
 create mode 100644 test/parallel/test-worker-heapdump-failure.js
 create mode 100644 test/pummel/test-worker-take-heapsnapshot.js

diff --git a/doc/api/errors.md b/doc/api/errors.md
index 18396f0ef8dfad..08360e435551f2 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -2053,6 +2053,11 @@ The WASI instance has already started.
 The `execArgv` option passed to the `Worker` constructor contains
 invalid flags.
 
+<a id="ERR_WORKER_NOT_RUNNING"></a>
+### `ERR_WORKER_NOT_RUNNING`
+
+An operation failed because the `Worker` instance is not currently running.
+
 <a id="ERR_WORKER_OUT_OF_MEMORY"></a>
 ### `ERR_WORKER_OUT_OF_MEMORY`
 
@@ -2445,7 +2450,7 @@ such as `process.stdout.on('data')`.
 [`'uncaughtException'`]: process.html#process_event_uncaughtexception
 [`--force-fips`]: cli.html#cli_force_fips
 [`Class: assert.AssertionError`]: assert.html#assert_class_assert_assertionerror
-[`ERR_INVALID_ARG_TYPE`]: #ERR_INVALID_ARG_TYPE
+[`ERR_INVALID_ARG_TYPE`]: #errors_err_worker_not_running
 [`EventEmitter`]: events.html#events_class_eventemitter
 [`REPL`]: repl.html
 [`Writable`]: stream.html#stream_class_stream_writable
diff --git a/doc/api/worker_threads.md b/doc/api/worker_threads.md
index 6812e6966dae66..75210466499b4c 100644
--- a/doc/api/worker_threads.md
+++ b/doc/api/worker_threads.md
@@ -674,6 +674,21 @@ inside the worker thread. If `stdout: true` was not passed to the
 [`Worker`][] constructor, then data will be piped to the parent thread's
 [`process.stdout`][] stream.
 
+### `worker.takeHeapSnapshot()`
+<!-- YAML
+added: REPLACEME
+-->
+
+* Returns: {Promise} A promise for a Readable Stream containing
+  a V8 heap snapshot
+
+Returns a readable stream for a V8 snapshot of the current state of the Worker.
+See [`v8.getHeapSnapshot()`][] for more details.
+
+If the Worker thread is no longer running, which may occur before the
+[`'exit'` event][] is emitted, the returned `Promise` will be rejected
+immediately with an [`ERR_WORKER_NOT_RUNNING`][] error.
+
 ### `worker.terminate()`
 <!-- YAML
 added: v10.5.0
@@ -716,6 +731,7 @@ active handle in the event system. If the worker is already `unref()`ed calling
 [`'exit'` event]: #worker_threads_event_exit
 [`AsyncResource`]: async_hooks.html#async_hooks_class_asyncresource
 [`Buffer`]: buffer.html
+[`ERR_WORKER_NOT_RUNNING`]: errors.html#
 [`EventEmitter`]: events.html
 [`EventTarget`]: https://developer.mozilla.org/en-US/docs/Web/API/EventTarget
 [`MessagePort`]: #worker_threads_class_messageport
@@ -743,6 +759,7 @@ active handle in the event system. If the worker is already `unref()`ed calling
 [`require('worker_threads').threadId`]: #worker_threads_worker_threadid
 [`require('worker_threads').workerData`]: #worker_threads_worker_workerdata
 [`trace_events`]: tracing.html
+[`v8.getHeapSnapshot()`]: v8.html#v8_v8_getheapsnapshot
 [`vm`]: vm.html
 [`worker.on('message')`]: #worker_threads_event_message_1
 [`worker.postMessage()`]: #worker_threads_worker_postmessage_value_transferlist
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index d90ea08d4dce13..0d88a92eb41ecc 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -1361,6 +1361,7 @@ E('ERR_WASI_ALREADY_STARTED', 'WASI instance has already started', Error);
 E('ERR_WORKER_INVALID_EXEC_ARGV', (errors) =>
   `Initiated Worker with invalid execArgv flags: ${errors.join(', ')}`,
   Error);
+E('ERR_WORKER_NOT_RUNNING', 'Worker instance not running', Error);
 E('ERR_WORKER_OUT_OF_MEMORY', 'Worker terminated due to reaching memory limit',
   Error);
 E('ERR_WORKER_PATH',
diff --git a/lib/internal/heap_utils.js b/lib/internal/heap_utils.js
new file mode 100644
index 00000000000000..126fe3f7e46a0c
--- /dev/null
+++ b/lib/internal/heap_utils.js
@@ -0,0 +1,41 @@
+'use strict';
+const {
+  Symbol
+} = primordials;
+const {
+  kUpdateTimer,
+  onStreamRead,
+} = require('internal/stream_base_commons');
+const { owner_symbol } = require('internal/async_hooks').symbols;
+const { Readable } = require('stream');
+
+const kHandle = Symbol('kHandle');
+
+class HeapSnapshotStream extends Readable {
+  constructor(handle) {
+    super({ autoDestroy: true });
+    this[kHandle] = handle;
+    handle[owner_symbol] = this;
+    handle.onread = onStreamRead;
+  }
+
+  _read() {
+    if (this[kHandle])
+      this[kHandle].readStart();
+  }
+
+  _destroy() {
+    // Release the references on the handle so that
+    // it can be garbage collected.
+    this[kHandle][owner_symbol] = undefined;
+    this[kHandle] = undefined;
+  }
+
+  [kUpdateTimer]() {
+    // Does nothing
+  }
+}
+
+module.exports = {
+  HeapSnapshotStream
+};
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
index f078d5329d6017..dd4d830edd8387 100644
--- a/lib/internal/worker.js
+++ b/lib/internal/worker.js
@@ -19,6 +19,7 @@ const path = require('path');
 
 const errorCodes = require('internal/errors').codes;
 const {
+  ERR_WORKER_NOT_RUNNING,
   ERR_WORKER_PATH,
   ERR_WORKER_UNSERIALIZABLE_ERROR,
   ERR_WORKER_UNSUPPORTED_EXTENSION,
@@ -42,6 +43,7 @@ const {
   WritableWorkerStdio
 } = workerIo;
 const { deserializeError } = require('internal/error-serdes');
+const { HeapSnapshotStream } = require('internal/heap_utils');
 const { pathToFileURL } = require('url');
 
 const {
@@ -314,6 +316,16 @@ class Worker extends EventEmitter {
 
     return makeResourceLimits(this[kHandle].getResourceLimits());
   }
+
+  getHeapSnapshot() {
+    const heapSnapshotTaker = this[kHandle] && this[kHandle].takeHeapSnapshot();
+    if (!heapSnapshotTaker) return Promise.reject(new ERR_WORKER_NOT_RUNNING());
+    return new Promise((resolve) => {
+      heapSnapshotTaker.ondone = (handle) => {
+        resolve(new HeapSnapshotStream(handle));
+      };
+    });
+  }
 }
 
 function pipeWithoutWarning(source, dest) {
diff --git a/lib/v8.js b/lib/v8.js
index a648d995404836..5841f204986fd7 100644
--- a/lib/v8.js
+++ b/lib/v8.js
@@ -25,7 +25,6 @@ const {
   Int8Array,
   Map,
   ObjectPrototypeToString,
-  Symbol,
   Uint16Array,
   Uint32Array,
   Uint8Array,
@@ -48,14 +47,7 @@ const {
   createHeapSnapshotStream,
   triggerHeapSnapshot
 } = internalBinding('heap_utils');
-const { Readable } = require('stream');
-const { owner_symbol } = require('internal/async_hooks').symbols;
-const {
-  kUpdateTimer,
-  onStreamRead,
-} = require('internal/stream_base_commons');
-const kHandle = Symbol('kHandle');
-
+const { HeapSnapshotStream } = require('internal/heap_utils');
 
 function writeHeapSnapshot(filename) {
   if (filename !== undefined) {
@@ -65,31 +57,6 @@ function writeHeapSnapshot(filename) {
   return triggerHeapSnapshot(filename);
 }
 
-class HeapSnapshotStream extends Readable {
-  constructor(handle) {
-    super({ autoDestroy: true });
-    this[kHandle] = handle;
-    handle[owner_symbol] = this;
-    handle.onread = onStreamRead;
-  }
-
-  _read() {
-    if (this[kHandle])
-      this[kHandle].readStart();
-  }
-
-  _destroy() {
-    // Release the references on the handle so that
-    // it can be garbage collected.
-    this[kHandle][owner_symbol] = undefined;
-    this[kHandle] = undefined;
-  }
-
-  [kUpdateTimer]() {
-    // Does nothing
-  }
-}
-
 function getHeapSnapshot() {
   const handle = createHeapSnapshotStream();
   assert(handle);
@@ -321,5 +288,5 @@ module.exports = {
   DefaultDeserializer,
   deserialize,
   serialize,
-  writeHeapSnapshot
+  writeHeapSnapshot,
 };
diff --git a/node.gyp b/node.gyp
index 8a13f15d708db3..b796b526a0cfc4 100644
--- a/node.gyp
+++ b/node.gyp
@@ -138,6 +138,7 @@
       'lib/internal/fs/utils.js',
       'lib/internal/fs/watchers.js',
       'lib/internal/http.js',
+      'lib/internal/heap_utils.js',
       'lib/internal/idna.js',
       'lib/internal/inspector_async_hook.js',
       'lib/internal/js_stream_socket.js',
diff --git a/src/async_wrap.h b/src/async_wrap.h
index 86acf54cd68917..58d6ca84db8b13 100644
--- a/src/async_wrap.h
+++ b/src/async_wrap.h
@@ -70,6 +70,7 @@ namespace node {
   V(UDPWRAP)                                                                  \
   V(SIGINTWATCHDOG)                                                           \
   V(WORKER)                                                                   \
+  V(WORKERHEAPSNAPSHOT)                                                       \
   V(WRITEWRAP)                                                                \
   V(ZLIB)
 
diff --git a/src/env.h b/src/env.h
index 1f8442d478b585..3b636dafd2c7d7 100644
--- a/src/env.h
+++ b/src/env.h
@@ -414,7 +414,8 @@ constexpr size_t kFsStatsBufferLength =
   V(streambaseoutputstream_constructor_template, v8::ObjectTemplate)           \
   V(tcp_constructor_template, v8::FunctionTemplate)                            \
   V(tty_constructor_template, v8::FunctionTemplate)                            \
-  V(write_wrap_template, v8::ObjectTemplate)
+  V(write_wrap_template, v8::ObjectTemplate)                                   \
+  V(worker_heap_snapshot_taker_template, v8::ObjectTemplate)
 
 #define ENVIRONMENT_STRONG_PERSISTENT_VALUES(V)                                \
   V(as_callback_data, v8::Object)                                              \
diff --git a/src/heap_utils.cc b/src/heap_utils.cc
index b6c8c75c159846..d16dac01e9f7be 100644
--- a/src/heap_utils.cc
+++ b/src/heap_utils.cc
@@ -236,18 +236,16 @@ class HeapSnapshotStream : public AsyncWrap,
  public:
   HeapSnapshotStream(
       Environment* env,
-      const HeapSnapshot* snapshot,
+      HeapSnapshotPointer&& snapshot,
       v8::Local<v8::Object> obj) :
       AsyncWrap(env, obj, AsyncWrap::PROVIDER_HEAPSNAPSHOT),
       StreamBase(env),
-      snapshot_(snapshot) {
+      snapshot_(std::move(snapshot)) {
     MakeWeak();
     StreamBase::AttachToObject(GetObject());
   }
 
-  ~HeapSnapshotStream() override {
-    Cleanup();
-  }
+  ~HeapSnapshotStream() override {}
 
   int GetChunkSize() override {
     return 65536;  // big chunks == faster
@@ -255,7 +253,7 @@ class HeapSnapshotStream : public AsyncWrap,
 
   void EndOfStream() override {
     EmitRead(UV_EOF);
-    Cleanup();
+    snapshot_.reset();
   }
 
   WriteResult WriteAsciiChunk(char* data, int size) override {
@@ -309,22 +307,13 @@ class HeapSnapshotStream : public AsyncWrap,
   SET_SELF_SIZE(HeapSnapshotStream)
 
  private:
-  void Cleanup() {
-    if (snapshot_ != nullptr) {
-      const_cast<HeapSnapshot*>(snapshot_)->Delete();
-      snapshot_ = nullptr;
-    }
-  }
-
-
-  const HeapSnapshot* snapshot_;
+  HeapSnapshotPointer snapshot_;
 };
 
 inline void TakeSnapshot(Isolate* isolate, v8::OutputStream* out) {
-  const HeapSnapshot* const snapshot =
-      isolate->GetHeapProfiler()->TakeHeapSnapshot();
+  HeapSnapshotPointer snapshot {
+      isolate->GetHeapProfiler()->TakeHeapSnapshot() };
   snapshot->Serialize(out, HeapSnapshot::kJSON);
-  const_cast<HeapSnapshot*>(snapshot)->Delete();
 }
 
 inline bool WriteSnapshot(Isolate* isolate, const char* filename) {
@@ -339,20 +328,43 @@ inline bool WriteSnapshot(Isolate* isolate, const char* filename) {
 
 }  // namespace
 
-void CreateHeapSnapshotStream(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
+void DeleteHeapSnapshot(const v8::HeapSnapshot* snapshot) {
+  const_cast<HeapSnapshot*>(snapshot)->Delete();
+}
+
+BaseObjectPtr<AsyncWrap> CreateHeapSnapshotStream(
+    Environment* env, HeapSnapshotPointer&& snapshot) {
   HandleScope scope(env->isolate());
-  const HeapSnapshot* const snapshot =
-      env->isolate()->GetHeapProfiler()->TakeHeapSnapshot();
-  CHECK_NOT_NULL(snapshot);
+
+  if (env->streambaseoutputstream_constructor_template().IsEmpty()) {
+    // Create FunctionTemplate for HeapSnapshotStream
+    Local<FunctionTemplate> os = FunctionTemplate::New(env->isolate());
+    os->Inherit(AsyncWrap::GetConstructorTemplate(env));
+    Local<ObjectTemplate> ost = os->InstanceTemplate();
+    ost->SetInternalFieldCount(StreamBase::kStreamBaseFieldCount);
+    os->SetClassName(FIXED_ONE_BYTE_STRING(env->isolate(), "HeapSnapshotStream"));
+    StreamBase::AddMethods(env, os);
+    env->set_streambaseoutputstream_constructor_template(ost);
+  }
+
   Local<Object> obj;
   if (!env->streambaseoutputstream_constructor_template()
            ->NewInstance(env->context())
            .ToLocal(&obj)) {
-    return;
+    return {};
   }
-  HeapSnapshotStream* out = new HeapSnapshotStream(env, snapshot, obj);
-  args.GetReturnValue().Set(out->object());
+  return MakeBaseObject<HeapSnapshotStream>(env, std::move(snapshot), obj);
+}
+
+void CreateHeapSnapshotStream(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
+  HeapSnapshotPointer snapshot {
+      env->isolate()->GetHeapProfiler()->TakeHeapSnapshot() };
+  CHECK(snapshot);
+  BaseObjectPtr<AsyncWrap> stream =
+      CreateHeapSnapshotStream(env, std::move(snapshot));
+  if (stream)
+    args.GetReturnValue().Set(stream->object());
 }
 
 void TriggerHeapSnapshot(const FunctionCallbackInfo<Value>& args) {
@@ -388,15 +400,6 @@ void Initialize(Local<Object> target,
   env->SetMethod(target, "buildEmbedderGraph", BuildEmbedderGraph);
   env->SetMethod(target, "triggerHeapSnapshot", TriggerHeapSnapshot);
   env->SetMethod(target, "createHeapSnapshotStream", CreateHeapSnapshotStream);
-
-  // Create FunctionTemplate for HeapSnapshotStream
-  Local<FunctionTemplate> os = FunctionTemplate::New(env->isolate());
-  os->Inherit(AsyncWrap::GetConstructorTemplate(env));
-  Local<ObjectTemplate> ost = os->InstanceTemplate();
-  ost->SetInternalFieldCount(StreamBase::kStreamBaseFieldCount);
-  os->SetClassName(FIXED_ONE_BYTE_STRING(env->isolate(), "HeapSnapshotStream"));
-  StreamBase::AddMethods(env, os);
-  env->set_streambaseoutputstream_constructor_template(ost);
 }
 
 }  // namespace heap
diff --git a/src/node_internals.h b/src/node_internals.h
index 6e50b22af2f915..a04acc6b3fa71c 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -382,6 +382,16 @@ class TraceEventScope {
   void* id_;
 };
 
+namespace heap {
+
+void DeleteHeapSnapshot(const v8::HeapSnapshot* snapshot);
+using HeapSnapshotPointer =
+  DeleteFnPtr<const v8::HeapSnapshot, DeleteHeapSnapshot>;
+
+BaseObjectPtr<AsyncWrap> CreateHeapSnapshotStream(
+    Environment* env, HeapSnapshotPointer&& snapshot);
+}  // namespace heap
+
 }  // namespace node
 
 #endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
diff --git a/src/node_worker.cc b/src/node_worker.cc
index b350219d813832..6465448ddabc4a 100644
--- a/src/node_worker.cc
+++ b/src/node_worker.cc
@@ -657,6 +657,52 @@ void Worker::MemoryInfo(MemoryTracker* tracker) const {
   tracker->TrackField("parent_port", parent_port_);
 }
 
+class WorkerHeapSnapshotTaker : public AsyncWrap {
+ public:
+  WorkerHeapSnapshotTaker(Environment* env, Local<Object> obj)
+    : AsyncWrap(env, obj, AsyncWrap::PROVIDER_WORKERHEAPSNAPSHOT) {}
+
+  SET_NO_MEMORY_INFO()
+  SET_MEMORY_INFO_NAME(WorkerHeapSnapshotTaker)
+  SET_SELF_SIZE(WorkerHeapSnapshotTaker)
+};
+
+void Worker::TakeHeapSnapshot(const FunctionCallbackInfo<Value>& args) {
+  Worker* w;
+  ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
+
+  Debug(w, "Worker %llu taking heap snapshot", w->thread_id_);
+
+  Environment* env = w->env();
+  AsyncHooks::DefaultTriggerAsyncIdScope trigger_id_scope(w);
+  Local<Object> wrap;
+  if (!env->worker_heap_snapshot_taker_template()
+      ->NewInstance(env->context()).ToLocal(&wrap)) {
+    return;
+  }
+  BaseObjectPtr<WorkerHeapSnapshotTaker> taker =
+      MakeDetachedBaseObject<WorkerHeapSnapshotTaker>(env, wrap);
+
+  // Interrupt the worker thread and take a snapshot, then schedule a call
+  // on the parent thread that turns that snapshot into a readable stream.
+  bool scheduled = w->RequestInterrupt([taker, env](Environment* worker_env) {
+    heap::HeapSnapshotPointer snapshot {
+        worker_env->isolate()->GetHeapProfiler()->TakeHeapSnapshot() };
+    CHECK(snapshot);
+    env->SetImmediateThreadsafe(
+        [taker, snapshot = std::move(snapshot)](Environment* env) mutable {
+          HandleScope handle_scope(env->isolate());
+          Context::Scope context_scope(env->context());
+
+          BaseObjectPtr<AsyncWrap> stream = heap::CreateHeapSnapshotStream(
+              env, std::move(snapshot));
+          Local<Value> args[] = { stream->object() };
+          taker->MakeCallback(env->ondone_string(), arraysize(args), args);
+        });
+  });
+  args.GetReturnValue().Set(scheduled ? taker->object() : Local<Object>());
+}
+
 namespace {
 
 // Return the MessagePort that is global for this Environment and communicates
@@ -689,6 +735,7 @@ void InitWorker(Local<Object> target,
     env->SetProtoMethod(w, "ref", Worker::Ref);
     env->SetProtoMethod(w, "unref", Worker::Unref);
     env->SetProtoMethod(w, "getResourceLimits", Worker::GetResourceLimits);
+    env->SetProtoMethod(w, "takeHeapSnapshot", Worker::TakeHeapSnapshot);
 
     Local<String> workerString =
         FIXED_ONE_BYTE_STRING(env->isolate(), "Worker");
@@ -698,6 +745,18 @@ void InitWorker(Local<Object> target,
                 w->GetFunction(env->context()).ToLocalChecked()).Check();
   }
 
+  {
+    Local<FunctionTemplate> wst = FunctionTemplate::New(env->isolate());
+
+    wst->InstanceTemplate()->SetInternalFieldCount(1);
+    wst->Inherit(AsyncWrap::GetConstructorTemplate(env));
+
+    Local<String> wst_string =
+        FIXED_ONE_BYTE_STRING(env->isolate(), "WorkerHeapSnapshotTaker");
+    wst->SetClassName(wst_string);
+    env->set_worker_heap_snapshot_taker_template(wst->InstanceTemplate());
+  }
+
   env->SetMethod(target, "getEnvMessagePort", GetEnvMessagePort);
 
   target
diff --git a/src/node_worker.h b/src/node_worker.h
index f84362f35c1897..893e03db53f93e 100644
--- a/src/node_worker.h
+++ b/src/node_worker.h
@@ -59,6 +59,7 @@ class Worker : public AsyncWrap {
   static void GetResourceLimits(
       const v8::FunctionCallbackInfo<v8::Value>& args);
   v8::Local<v8::Float64Array> GetResourceLimits(v8::Isolate* isolate) const;
+  static void TakeHeapSnapshot(const v8::FunctionCallbackInfo<v8::Value>& args);
 
  private:
   void CreateEnvMessagePort(Environment* env);
diff --git a/test/common/heap.js b/test/common/heap.js
index 030ea773404d14..a6232177ba9fd3 100644
--- a/test/common/heap.js
+++ b/test/common/heap.js
@@ -14,8 +14,7 @@ try {
 const { buildEmbedderGraph } = internalBinding('heap_utils');
 const { getHeapSnapshot } = require('v8');
 
-function createJSHeapSnapshot() {
-  const stream = getHeapSnapshot();
+function createJSHeapSnapshot(stream = getHeapSnapshot()) {
   stream.pause();
   const dump = JSON.parse(stream.read());
   const meta = dump.snapshot.meta;
@@ -106,8 +105,8 @@ function isEdge(edge, { node_name, edge_name }) {
 }
 
 class State {
-  constructor() {
-    this.snapshot = createJSHeapSnapshot();
+  constructor(stream) {
+    this.snapshot = createJSHeapSnapshot(stream);
     this.embedderGraph = buildEmbedderGraph();
   }
 
@@ -189,8 +188,8 @@ class State {
   }
 }
 
-function recordState() {
-  return new State();
+function recordState(stream = undefined) {
+  return new State(stream);
 }
 
 function validateSnapshotNodes(...args) {
diff --git a/test/parallel/test-worker-heapdump-failure.js b/test/parallel/test-worker-heapdump-failure.js
new file mode 100644
index 00000000000000..06e260374cd3a4
--- /dev/null
+++ b/test/parallel/test-worker-heapdump-failure.js
@@ -0,0 +1,15 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const { Worker } = require('worker_threads');
+const { once } = require('events');
+
+(async function() {
+  const w = new Worker('', { eval: true });
+
+  await once(w, 'exit');
+  await assert.rejects(() => w.getHeapSnapshot(), {
+    name: 'Error',
+    code: 'ERR_WORKER_NOT_RUNNING'
+  });
+})().then(common.mustCall());
diff --git a/test/pummel/test-worker-take-heapsnapshot.js b/test/pummel/test-worker-take-heapsnapshot.js
new file mode 100644
index 00000000000000..b369759d0613e5
--- /dev/null
+++ b/test/pummel/test-worker-take-heapsnapshot.js
@@ -0,0 +1,22 @@
+// Flags: --expose-internals
+'use strict';
+const common = require('../common');
+const { recordState } = require('../common/heap');
+const { Worker } = require('worker_threads');
+const { once } = require('events');
+
+(async function() {
+  const w = new Worker('setInterval(() => {}, 100)', { eval: true });
+
+  await once(w, 'online');
+  const stream = await w.getHeapSnapshot();
+  const snapshot = recordState(stream);
+  snapshot.validateSnapshot('Node / MessagePort', [
+    {
+      children: [
+        { node_name: 'Node / MessagePortData', edge_name: 'data' }
+      ]
+    }
+  ], { loose: true });
+  await w.terminate();
+})().then(common.mustCall());

From 7a7e76f0de620a32d20da923a9272bfe676365e5 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Wed, 29 Jan 2020 17:31:41 +0000
Subject: [PATCH 2/6] fixup! worker: add ability to take heap snapshot from
 parent thread

---
 src/node_worker.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/node_worker.cc b/src/node_worker.cc
index 6465448ddabc4a..bb13b2004bc001 100644
--- a/src/node_worker.cc
+++ b/src/node_worker.cc
@@ -694,6 +694,7 @@ void Worker::TakeHeapSnapshot(const FunctionCallbackInfo<Value>& args) {
           HandleScope handle_scope(env->isolate());
           Context::Scope context_scope(env->context());
 
+          AsyncHooks::DefaultTriggerAsyncIdScope trigger_id_scope(taker.get());
           BaseObjectPtr<AsyncWrap> stream = heap::CreateHeapSnapshotStream(
               env, std::move(snapshot));
           Local<Value> args[] = { stream->object() };

From 1500f9e4bd0c8b813e3becc6803b67c5cc280891 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Wed, 29 Jan 2020 17:47:27 +0000
Subject: [PATCH 3/6] fixup! worker: add ability to take heap snapshot from
 parent thread

---
 doc/api/errors.md         | 2 +-
 doc/api/worker_threads.md | 2 +-
 lib/internal/worker.js    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/api/errors.md b/doc/api/errors.md
index 08360e435551f2..b186275807aee7 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -2450,7 +2450,7 @@ such as `process.stdout.on('data')`.
 [`'uncaughtException'`]: process.html#process_event_uncaughtexception
 [`--force-fips`]: cli.html#cli_force_fips
 [`Class: assert.AssertionError`]: assert.html#assert_class_assert_assertionerror
-[`ERR_INVALID_ARG_TYPE`]: #errors_err_worker_not_running
+[`ERR_INVALID_ARG_TYPE`]: #ERR_INVALID_ARG_TYPE
 [`EventEmitter`]: events.html#events_class_eventemitter
 [`REPL`]: repl.html
 [`Writable`]: stream.html#stream_class_stream_writable
diff --git a/doc/api/worker_threads.md b/doc/api/worker_threads.md
index 75210466499b4c..6ae0ada97f193a 100644
--- a/doc/api/worker_threads.md
+++ b/doc/api/worker_threads.md
@@ -731,7 +731,7 @@ active handle in the event system. If the worker is already `unref()`ed calling
 [`'exit'` event]: #worker_threads_event_exit
 [`AsyncResource`]: async_hooks.html#async_hooks_class_asyncresource
 [`Buffer`]: buffer.html
-[`ERR_WORKER_NOT_RUNNING`]: errors.html#
+[`ERR_WORKER_NOT_RUNNING`]: errors.html#ERR_WORKER_NOT_RUNNING
 [`EventEmitter`]: events.html
 [`EventTarget`]: https://developer.mozilla.org/en-US/docs/Web/API/EventTarget
 [`MessagePort`]: #worker_threads_class_messageport
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
index dd4d830edd8387..539e76147e8a7d 100644
--- a/lib/internal/worker.js
+++ b/lib/internal/worker.js
@@ -319,8 +319,8 @@ class Worker extends EventEmitter {
 
   getHeapSnapshot() {
     const heapSnapshotTaker = this[kHandle] && this[kHandle].takeHeapSnapshot();
-    if (!heapSnapshotTaker) return Promise.reject(new ERR_WORKER_NOT_RUNNING());
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+      if (!heapSnapshotTaker) return reject(new ERR_WORKER_NOT_RUNNING());
       heapSnapshotTaker.ondone = (handle) => {
         resolve(new HeapSnapshotStream(handle));
       };

From 60bcee13bf6fb29026c9c303f2a422fdfb277ef6 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Wed, 29 Jan 2020 18:16:01 +0000
Subject: [PATCH 4/6] fixup! worker: add ability to take heap snapshot from
 parent thread

---
 src/heap_utils.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/heap_utils.cc b/src/heap_utils.cc
index d16dac01e9f7be..68cd532c230830 100644
--- a/src/heap_utils.cc
+++ b/src/heap_utils.cc
@@ -342,7 +342,8 @@ BaseObjectPtr<AsyncWrap> CreateHeapSnapshotStream(
     os->Inherit(AsyncWrap::GetConstructorTemplate(env));
     Local<ObjectTemplate> ost = os->InstanceTemplate();
     ost->SetInternalFieldCount(StreamBase::kStreamBaseFieldCount);
-    os->SetClassName(FIXED_ONE_BYTE_STRING(env->isolate(), "HeapSnapshotStream"));
+    os->SetClassName(
+        FIXED_ONE_BYTE_STRING(env->isolate(), "HeapSnapshotStream"));
     StreamBase::AddMethods(env, os);
     env->set_streambaseoutputstream_constructor_template(ost);
   }

From bc64b60359bf421e348b10e31d4097acdcbd9564 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Sat, 1 Feb 2020 11:16:04 +0100
Subject: [PATCH 5/6] fixup! worker: add ability to take heap snapshot from
 parent thread

---
 lib/internal/worker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/worker.js b/lib/internal/worker.js
index 539e76147e8a7d..683b1f6e6db8c7 100644
--- a/lib/internal/worker.js
+++ b/lib/internal/worker.js
@@ -43,7 +43,6 @@ const {
   WritableWorkerStdio
 } = workerIo;
 const { deserializeError } = require('internal/error-serdes');
-const { HeapSnapshotStream } = require('internal/heap_utils');
 const { pathToFileURL } = require('url');
 
 const {
@@ -322,6 +321,7 @@ class Worker extends EventEmitter {
     return new Promise((resolve, reject) => {
       if (!heapSnapshotTaker) return reject(new ERR_WORKER_NOT_RUNNING());
       heapSnapshotTaker.ondone = (handle) => {
+        const { HeapSnapshotStream } = require('internal/heap_utils');
         resolve(new HeapSnapshotStream(handle));
       };
     });

From 6bbff2023d28866a1b5a55b7c861c123f371abea Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Fri, 31 Jan 2020 22:15:34 +0100
Subject: [PATCH 6/6] fixup! worker: add ability to take heap snapshot from
 parent thread

---
 test/sequential/test-async-wrap-getasyncid.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/sequential/test-async-wrap-getasyncid.js b/test/sequential/test-async-wrap-getasyncid.js
index 8e532ec48c308d..ab1f2110a3debc 100644
--- a/test/sequential/test-async-wrap-getasyncid.js
+++ b/test/sequential/test-async-wrap-getasyncid.js
@@ -52,6 +52,7 @@ const { getSystemErrorName } = require('util');
     delete providers.HTTPINCOMINGMESSAGE;
     delete providers.ELDHISTOGRAM;
     delete providers.SIGINTWATCHDOG;
+    delete providers.WORKERHEAPSNAPSHOT;
 
     const objKeys = Object.keys(providers);
     if (objKeys.length > 0)