Skip to content

Commit 2559323

Browse files
committedFeb 4, 2023
src: make edge names in BaseObjects more descriptive in heap snapshots
Previously these were named "wrapper" and "wrapped", which can be somewhat difficult to understand. This patch renames them to "javascript_to_native" and "native_to_javascript".
1 parent b8b92ca commit 2559323

7 files changed

+14
-14
lines changed
 

‎src/memory_tracker-inl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ MemoryRetainerNode* MemoryTracker::AddNode(const MemoryRetainer* retainer,
318318
if (CurrentNode() != nullptr) graph_->AddEdge(CurrentNode(), n, edge_name);
319319

320320
if (n->JSWrapperNode() != nullptr) {
321-
graph_->AddEdge(n, n->JSWrapperNode(), "wrapped");
322-
graph_->AddEdge(n->JSWrapperNode(), n, "wrapper");
321+
graph_->AddEdge(n, n->JSWrapperNode(), "native_to_javascript");
322+
graph_->AddEdge(n->JSWrapperNode(), n, "javascript_to_native");
323323
}
324324

325325
return n;

‎test/pummel/test-heapdump-dns.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ validateSnapshotNodes('Node / ChannelWrap', [
1212
children: [
1313
{ node_name: 'Node / NodeAresTask::List', edge_name: 'task_list' },
1414
// `Node / ChannelWrap` (C++) -> `ChannelWrap` (JS)
15-
{ node_name: 'ChannelWrap', edge_name: 'wrapped' },
15+
{ node_name: 'ChannelWrap', edge_name: 'native_to_javascript' },
1616
],
1717
detachedness: 2
1818
},

‎test/pummel/test-heapdump-fs-promise.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fs.stat(__filename);
99
validateSnapshotNodes('Node / FSReqPromise', [
1010
{
1111
children: [
12-
{ node_name: 'FSReqPromise', edge_name: 'wrapped' },
12+
{ node_name: 'FSReqPromise', edge_name: 'native_to_javascript' },
1313
{ node_name: 'Float64Array', edge_name: 'stats_field_array' },
1414
]
1515
},

‎test/pummel/test-heapdump-http2.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ server.listen(0, () => {
2828
{
2929
children: [
3030
// current_headers and/or queue could be empty
31-
{ node_name: 'Http2Stream', edge_name: 'wrapped' },
31+
{ node_name: 'Http2Stream', edge_name: 'native_to_javascript' },
3232
]
3333
},
3434
], { loose: true });
@@ -37,38 +37,38 @@ server.listen(0, () => {
3737
state.validateSnapshotNodes('Node / FileHandle', [
3838
{
3939
children: [
40-
{ node_name: 'FileHandle', edge_name: 'wrapped' },
40+
{ node_name: 'FileHandle', edge_name: 'native_to_javascript' },
4141
// current_headers could be empty
4242
]
4343
},
4444
], { loose: true });
4545
state.validateSnapshotNodes('Node / TCPSocketWrap', [
4646
{
4747
children: [
48-
{ node_name: 'TCP', edge_name: 'wrapped' },
48+
{ node_name: 'TCP', edge_name: 'native_to_javascript' },
4949
]
5050
},
5151
], { loose: true });
5252
state.validateSnapshotNodes('Node / TCPServerWrap', [
5353
{
5454
children: [
55-
{ node_name: 'TCP', edge_name: 'wrapped' },
55+
{ node_name: 'TCP', edge_name: 'native_to_javascript' },
5656
]
5757
},
5858
], { loose: true });
5959
// `Node / StreamPipe` (C++) -> StreamPipe (JS)
6060
state.validateSnapshotNodes('Node / StreamPipe', [
6161
{
6262
children: [
63-
{ node_name: 'StreamPipe', edge_name: 'wrapped' },
63+
{ node_name: 'StreamPipe', edge_name: 'native_to_javascript' },
6464
]
6565
},
6666
]);
6767
// `Node / Http2Session` (C++) -> Http2Session (JS)
6868
state.validateSnapshotNodes('Node / Http2Session', [
6969
{
7070
children: [
71-
{ node_name: 'Http2Session', edge_name: 'wrapped' },
71+
{ node_name: 'Http2Session', edge_name: 'native_to_javascript' },
7272
{ node_name: 'Node / nghttp2_memory', edge_name: 'nghttp2_memory' },
7373
{
7474
node_name: 'Node / streams', edge_name: 'streams'

‎test/pummel/test-heapdump-inspector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const snapshotNode = {
3030
{
3131
children: [
3232
{ node_name: 'Node / InspectorSession', edge_name: 'session' },
33-
{ node_name: 'Connection', edge_name: 'wrapped' },
33+
{ node_name: 'Connection', edge_name: 'native_to_javascript' },
3434
(edge) => edge.name === 'callback' &&
3535
(edge.to.type === undefined || // embedded graph
3636
edge.to.type === 'closure'), // snapshot

‎test/pummel/test-heapdump-tls.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const server = net.createServer(common.mustCall((c) => {
2727
{ node_name: 'Node / NodeBIO', edge_name: 'enc_out' },
2828
{ node_name: 'Node / NodeBIO', edge_name: 'enc_in' },
2929
// `Node / TLSWrap` (C++) -> `TLSWrap` (JS)
30-
{ node_name: 'TLSWrap', edge_name: 'wrapped' },
30+
{ node_name: 'TLSWrap', edge_name: 'native_to_javascript' },
3131
// pending_cleartext_input could be empty
3232
]
3333
},

‎test/pummel/test-heapdump-zlib.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const gzip = zlib.createGzip();
1010
validateSnapshotNodes('Node / ZlibStream', [
1111
{
1212
children: [
13-
{ node_name: 'Zlib', edge_name: 'wrapped' },
13+
{ node_name: 'Zlib', edge_name: 'native_to_javascript' },
1414
// No entry for memory because zlib memory is initialized lazily.
1515
]
1616
},
@@ -20,7 +20,7 @@ gzip.write('hello world', common.mustCall(() => {
2020
validateSnapshotNodes('Node / ZlibStream', [
2121
{
2222
children: [
23-
{ node_name: 'Zlib', edge_name: 'wrapped' },
23+
{ node_name: 'Zlib', edge_name: 'native_to_javascript' },
2424
{ node_name: 'Node / zlib_memory', edge_name: 'zlib_memory' },
2525
]
2626
},

0 commit comments

Comments
 (0)