src: add proper MemoryInfoName to wrappers

- Use camel case names for memory retainers inherited from AsyncWrap
  instead of their provider names (which are all in upper case)
- Assign class names to wraps so that they appear in the heap snapshot
  as nodes with class names as node names. Previously some nodes are
  named with reference names, which are supposed to be edge names
  instead.

PR-URL: https://github.com/nodejs/node/pull/21939
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>

7 files changed, 35 insertions, 27 deletions

diff --git a/test/parallel/test-heapdump-dns.js b/test/parallel/test-heapdump-dns.js
index 011503f587..00ca54917f 100644
--- a/test/parallel/test-heapdump-dns.js
+++ b/test/parallel/test-heapdump-dns.js
@@ -3,14 +3,15 @@
 require('../common');
 const { validateSnapshotNodes } = require('../common/heap');
 
-validateSnapshotNodes('DNSCHANNEL', []);
+validateSnapshotNodes('ChannelWrap', []);
 const dns = require('dns');
-validateSnapshotNodes('DNSCHANNEL', [{}]);
+validateSnapshotNodes('ChannelWrap', [{}]);
 dns.resolve('localhost', () => {});
-validateSnapshotNodes('DNSCHANNEL', [
+validateSnapshotNodes('ChannelWrap', [
   {
     children: [
-      { name: 'task list' },
+      { name: 'node_ares_task_list' },
+      // `Node / ChannelWrap` (C++) -> `ChannelWrap` (JS)
       { name: 'ChannelWrap' }
     ]
   }
diff --git a/test/parallel/test-heapdump-fs-promise.js b/test/parallel/test-heapdump-fs-promise.js
index be44b3d873..855b135f6a 100644
--- a/test/parallel/test-heapdump-fs-promise.js
+++ b/test/parallel/test-heapdump-fs-promise.js
@@ -4,9 +4,9 @@ require('../common');
 const { validateSnapshotNodes } = require('../common/heap');
 const fs = require('fs').promises;
 
-validateSnapshotNodes('FSREQPROMISE', []);
+validateSnapshotNodes('FSReqPromise', []);
 fs.stat(__filename);
-validateSnapshotNodes('FSREQPROMISE', [
+validateSnapshotNodes('FSReqPromise', [
   {
     children: [
       { name: 'FSReqPromise' },
diff --git a/test/parallel/test-heapdump-http2.js b/test/parallel/test-heapdump-http2.js
index 19a70d8c44..cbc1209ab0 100644
--- a/test/parallel/test-heapdump-http2.js
+++ b/test/parallel/test-heapdump-http2.js
@@ -8,8 +8,8 @@ if (!common.hasCrypto)
 
 {
   const state = recordState();
-  state.validateSnapshotNodes('HTTP2SESSION', []);
-  state.validateSnapshotNodes('HTTP2STREAM', []);
+  state.validateSnapshotNodes('Http2Session', []);
+  state.validateSnapshotNodes('Http2Stream', []);
 }
 
 const server = http2.createServer();
@@ -22,42 +22,48 @@ server.listen(0, () => {
 
   req.on('response', common.mustCall(() => {
     const state = recordState();
-    state.validateSnapshotNodes('HTTP2STREAM', [
+
+    // `Node / Http2Stream` (C++) -> Http2Stream (JS)
+    state.validateSnapshotNodes('Http2Stream', [
       {
         children: [
           { name: 'Http2Stream' }
         ]
       },
     ], { loose: true });
-    state.validateSnapshotNodes('FILEHANDLE', [
+
+    // `Node / FileHandle` (C++) -> FileHandle (JS)
+    state.validateSnapshotNodes('FileHandle', [
       {
         children: [
           { name: 'FileHandle' }
         ]
       }
     ]);
-    state.validateSnapshotNodes('TCPWRAP', [
+    state.validateSnapshotNodes('TCPSocketWrap', [
       {
         children: [
           { name: 'TCP' }
         ]
       }
     ], { loose: true });
-    state.validateSnapshotNodes('TCPSERVERWRAP', [
+    state.validateSnapshotNodes('TCPServerWrap', [
       {
         children: [
           { name: 'TCP' }
         ]
       }
     ], { loose: true });
-    state.validateSnapshotNodes('STREAMPIPE', [
+    // `Node / StreamPipe` (C++) -> StreamPipe (JS)
+    state.validateSnapshotNodes('StreamPipe', [
       {
         children: [
           { name: 'StreamPipe' }
         ]
       }
     ]);
-    state.validateSnapshotNodes('HTTP2SESSION', [
+    // `Node / Http2Session` (C++) -> Http2Session (JS)
+    state.validateSnapshotNodes('Http2Session', [
       {
         children: [
           { name: 'Http2Session' },
diff --git a/test/parallel/test-heapdump-inspector.js b/test/parallel/test-heapdump-inspector.js
index 355b8d0d0a..08fc6703d8 100644
--- a/test/parallel/test-heapdump-inspector.js
+++ b/test/parallel/test-heapdump-inspector.js
@@ -8,9 +8,9 @@ const { validateSnapshotNodes } = require('../common/heap');
 const inspector = require('inspector');
 
 const session = new inspector.Session();
-validateSnapshotNodes('INSPECTORJSBINDING', []);
+validateSnapshotNodes('JSBindingsConnection', []);
 session.connect();
-validateSnapshotNodes('INSPECTORJSBINDING', [
+validateSnapshotNodes('JSBindingsConnection', [
   {
     children: [
       { name: 'session' },
diff --git a/test/parallel/test-heapdump-tls.js b/test/parallel/test-heapdump-tls.js
index be14b7b5f7..90b2d8dc95 100644
--- a/test/parallel/test-heapdump-tls.js
+++ b/test/parallel/test-heapdump-tls.js
@@ -9,7 +9,7 @@ const { validateSnapshotNodes } = require('../common/heap');
 const net = require('net');
 const tls = require('tls');
 
-validateSnapshotNodes('TLSWRAP', []);
+validateSnapshotNodes('TLSWrap', []);
 
 const server = net.createServer(common.mustCall((c) => {
   c.end();
@@ -21,11 +21,12 @@ const server = net.createServer(common.mustCall((c) => {
   }));
   c.write('hello');
 
-  validateSnapshotNodes('TLSWRAP', [
+  validateSnapshotNodes('TLSWrap', [
     {
       children: [
-        { name: 'enc_out' },
-        { name: 'enc_in' },
+        { name: 'NodeBIO' },
+        { name: 'NodeBIO' },
+        // `Node / TLSWrap` (C++) -> `TLSWrap` (JS)
         { name: 'TLSWrap' }
       ]
     }
diff --git a/test/parallel/test-heapdump-worker.js b/test/parallel/test-heapdump-worker.js
index 68d2ccd1ab..b7b5c2f756 100644
--- a/test/parallel/test-heapdump-worker.js
+++ b/test/parallel/test-heapdump-worker.js
@@ -4,22 +4,22 @@ require('../common');
 const { validateSnapshotNodes } = require('../common/heap');
 const { Worker } = require('worker_threads');
 
-validateSnapshotNodes('WORKER', []);
+validateSnapshotNodes('Worker', []);
 const worker = new Worker('setInterval(() => {}, 100);', { eval: true });
-validateSnapshotNodes('WORKER', [
+validateSnapshotNodes('Worker', [
   {
     children: [
       { name: 'thread_exit_async' },
       { name: 'env' },
-      { name: 'MESSAGEPORT' },
+      { name: 'MessagePort' },
       { name: 'Worker' }
     ]
   }
 ]);
-validateSnapshotNodes('MESSAGEPORT', [
+validateSnapshotNodes('MessagePort', [
   {
     children: [
-      { name: 'data' },
+      { name: 'MessagePortData' },
       { name: 'MessagePort' }
     ]
   }
diff --git a/test/parallel/test-heapdump-zlib.js b/test/parallel/test-heapdump-zlib.js
index 7a749902f5..936e3a1a50 100644
--- a/test/parallel/test-heapdump-zlib.js
+++ b/test/parallel/test-heapdump-zlib.js
@@ -4,10 +4,10 @@ require('../common');
 const { validateSnapshotNodes } = require('../common/heap');
 const zlib = require('zlib');
 
-validateSnapshotNodes('ZLIB', []);
+validateSnapshotNodes('ZCtx', []);
 // eslint-disable-next-line no-unused-vars
 const gunzip = zlib.createGunzip();
-validateSnapshotNodes('ZLIB', [
+validateSnapshotNodes('ZCtx', [
   {
     children: [
       { name: 'Zlib' },