enhance(dev): tweak get-backend-memory

.github/scripts/measure-backend-memory-comparison.mts

@@ -8,30 +8,19 @@ import { copyFile, rm, writeFile } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import * as util from './utility.mts';
 import * as heapSnapshotUtil from './heap-snapshot-util.mts';
-import type { MemoryReportRaw } from '../../packages/backend/scripts/measure-memory.mts';
+import type { MemorySample } from '../../packages/backend/scripts/measure-memory.mts';
 
 const phases = ['afterGc'] as const;
 
 export type MemoryReport = {
 	timestamp: string;
-	sampleCount: any;
+	sampleCount: number;
 	aggregation: string;
-	measurement: {
-		startupTimeoutMs: any;
-		memorySettleTimeMs: any;
-		ipcTimeoutMs: any;
-		requestCount: any;
-		heapSnapshot: {
-			enabled: any;
-			timeoutMs: any;
-			breakdownTopN: any;
-		};
-	};
 	summary: Record<typeof phases[number], {
 		memoryUsage: Record<string, number>;
 		heapSnapshot?: heapSnapshotUtil.HeapSnapshotData;
 	}>;
-	samples: (MemoryReportRaw['samples'][number] & {
+	samples: (MemorySample & {
 		round: number;
 	})[];
 };
@@ -41,6 +30,8 @@ const [baseDirArg, headDirArg, baseOutputArg, headOutputArg] = process.argv.slic
 const HEAP_SNAPSHOT_BREAKDOWN_TOP_N = util.readIntegerEnv('MK_MEMORY_HEAP_SNAPSHOT_BREAKDOWN_TOP_N', heapSnapshotUtil.defaultHeapSnapshotBreakdownTopN, 1);
 const HEAD_HEAP_SNAPSHOT_WORK_DIR = resolve('head-heap-snapshots');
 const HEAD_HEAP_SNAPSHOT_OUTPUT_PATH = resolve('head-heap-snapshot.heapsnapshot');
+// Use the head checkout's measurement harness for both targets so only the built backend differs.
+const MEASURE_MEMORY_SCRIPT = resolve(import.meta.dirname, '../../packages/backend/scripts/measure-memory.mts');
 
 async function resetState(repoDir: string) {
 	const require = createRequire(join(repoDir, 'packages/backend/package.json'));
@@ -115,20 +106,17 @@ async function measureRepo(label: string, repoDir: string, round: number, option
 	process.stderr.write(`[${label}] Measuring memory\n`);
 	const measureEnv = {
 		...process.env,
-		MK_MEMORY_SAMPLE_COUNT: '1',
+		MK_MEMORY_BACKEND_DIR: resolve(repoDir, 'packages/backend'),
 	} as NodeJS.ProcessEnv;
 	if (round <= 0) measureEnv.MK_MEMORY_HEAP_SNAPSHOT = '0';
 	if (options.heapSnapshotSavePath != null) measureEnv.MK_MEMORY_HEAP_SNAPSHOT_SAVE_PATH = options.heapSnapshotSavePath;
 
-	const stdout = await util.run('node', ['packages/backend/scripts/measure-memory.mts'], {
+	const stdout = await util.run('node', [MEASURE_MEMORY_SCRIPT], {
 		cwd: repoDir,
 		env: measureEnv,
 	});
 
-	const report = JSON.parse(stdout) as MemoryReportRaw;
-	const sample = report.samples[0];
-
-	return sample;
+	return JSON.parse(stdout) as MemorySample;
 }
 
 function headHeapSnapshotPath(round: number) {

.github/scripts/memory-stability-util.mts

@@ -0,0 +1,75 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { setTimeout } from 'node:timers/promises';
+
+type MemoryStabilityTimer = {
+	now: () => number;
+	wait: (durationMs: number) => Promise<void>;
+};
+
+const intervalMs = 2000;
+const maxWaitMs = 10000;
+const windowSize = 3;
+const slopeThresholdKiBPerSecond = 256;
+const stabilityMetrics = ['Pss', 'Private_Dirty'] as const;
+
+const defaultTimer: MemoryStabilityTimer = {
+	now: () => performance.now(),
+	wait: durationMs => setTimeout(durationMs),
+};
+
+function getMaxAbsoluteSlopes<T extends Record<string, number>>(readings: { elapsedMs: number; memoryUsage: T }[]) {
+	const result = {} as Record<typeof stabilityMetrics[number], number>;
+
+	for (const metric of stabilityMetrics) {
+		let maxAbsoluteSlope = 0;
+		for (let i = 1; i < readings.length; i++) {
+			const previous = readings[i - 1];
+			const current = readings[i];
+			const durationSeconds = (current.elapsedMs - previous.elapsedMs) / 1000;
+			maxAbsoluteSlope = Math.max(maxAbsoluteSlope, Math.abs(current.memoryUsage[metric] - previous.memoryUsage[metric]) / durationSeconds);
+		}
+		result[metric] = maxAbsoluteSlope;
+	}
+
+	return result;
+}
+
+export async function measureMemoryUntilStable<T extends Record<string, number>>(
+	readMemoryUsage: () => Promise<T>,
+	timer: MemoryStabilityTimer = defaultTimer,
+) {
+	const startedAt = timer.now();
+	const readings: { elapsedMs: number; memoryUsage: T }[] = [];
+	let maxAbsoluteSlopesKiBPerSecond: Record<typeof stabilityMetrics[number], number> | null = null;
+
+	while (true) {
+		const memoryUsage = await readMemoryUsage();
+		const elapsedMs = timer.now() - startedAt;
+		readings.push({ elapsedMs, memoryUsage });
+
+		let converged = false;
+		if (readings.length >= windowSize) {
+			const latestSlopes = getMaxAbsoluteSlopes(readings.slice(-windowSize));
+			maxAbsoluteSlopesKiBPerSecond = latestSlopes;
+			converged = stabilityMetrics.every(metric => latestSlopes[metric] <= slopeThresholdKiBPerSecond);
+		}
+
+		if (converged || elapsedMs >= maxWaitMs) {
+			return {
+				memoryUsage,
+				stability: {
+					converged,
+					readingCount: readings.length,
+					elapsedMs,
+					maxAbsoluteSlopesKiBPerSecond,
+				},
+			};
+		}
+
+		await timer.wait(Math.min(intervalMs, maxWaitMs - elapsedMs));
+	}
+}

.github/workflows/get-backend-memory.yml

@@ -12,6 +12,7 @@ on:
       - .github/scripts/utility.mts
       - .github/scripts/backend-memory-report.mts
       - .github/scripts/measure-backend-memory-comparison.mts
+      - .github/scripts/memory-stability-util*.mts
       - .github/scripts/backend-js-footprint.mjs
       - .github/scripts/backend-js-footprint-loader.mjs
       - .github/scripts/backend-js-footprint-require.cjs

.github/workflows/lint.yml

@@ -19,6 +19,7 @@ on:
       - packages/shared/eslint.config.js
       - scripts/check-dts*.mjs
       - .github/scripts/frontend-js-size*.mts
+      - .github/scripts/memory-stability-util*.mts
       - .github/scripts/utility.mts
       - .github/workflows/lint.yml
       - package.json
@@ -37,6 +38,7 @@ on:
       - packages/shared/eslint.config.js
       - scripts/check-dts*.mjs
       - .github/scripts/frontend-js-size*.mts
+      - .github/scripts/memory-stability-util*.mts
       - .github/scripts/utility.mts
       - .github/workflows/lint.yml
       - package.json