perf_hooks: fix miscounted gc performance entry starttime (#43066) · nodejs/node@02009b7 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 637
• Pull requests 761
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 02009b7

Browse filesBrowse the repository at this point in the historyBrowse files

meixg

authored and

targos

committed

perf_hooks: fix miscounted gc performance entry starttime (#43066)

PR-URL: #43066 Fixes: #43062 Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

1 parent 752380a commit 02009b7
Copy full SHA for 02009b7

2 files changed

+5-2Lines changed: 5 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • node_perf.cc
• test/parallel
  • test-performance-gc.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/node_perf.cc‎

Copy file name to clipboardExpand all lines: src/node_perf.cc

+4-2Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -159,8 +159,10 @@ void MarkGarbageCollectionEnd(
159	159	if (LIKELY(!state->observers[NODE_PERFORMANCE_ENTRY_TYPE_GC]))
160	160	return;
161	161
162		- double start_time = state->performance_last_gc_start_mark / 1e6;
163		- double duration = (PERFORMANCE_NOW() / 1e6) - start_time;
	162	+ double start_time =
	163	+ (state->performance_last_gc_start_mark - timeOrigin) / 1e6;
	164	+ double duration =
	165	+ (PERFORMANCE_NOW() / 1e6) - (state->performance_last_gc_start_mark / 1e6);
164	166
165	167	std::unique_ptr<GCPerformanceEntry> entry =
166	168	std::make_unique<GCPerformanceEntry>(

Collapse file

‎test/parallel/test-performance-gc.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-performance-gc.js

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -35,6 +35,7 @@ const kinds = [
35	35	assert.strictEqual(entry.flags, NODE_PERFORMANCE_GC_FLAGS_FORCED);
36	36	assert.strictEqual(entry.detail.flags, NODE_PERFORMANCE_GC_FLAGS_FORCED);
37	37	assert.strictEqual(typeof entry.startTime, 'number');
	38	+ assert(entry.startTime < 1e4, 'startTime should be relative to performance.timeOrigin.');
38	39	assert.strictEqual(typeof entry.duration, 'number');
39	40	obs.disconnect();
40	41	}));

0 commit comments

Comments

0 (0)