src: allow setting a dir for all diagnostic output #33584
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| 'use strict'; | ||
|
|
||
| // This test is to ensure that --diagnostic-dir does not change the directory | ||
| // for --cpu-prof when --cpu-prof-dir is specified | ||
|
|
||
| const common = require('../common'); | ||
| const fixtures = require('../common/fixtures'); | ||
| common.skipIfInspectorDisabled(); | ||
|
|
||
| const assert = require('assert'); | ||
| const fs = require('fs'); | ||
| const path = require('path'); | ||
| const { spawnSync } = require('child_process'); | ||
|
|
||
| const tmpdir = require('../common/tmpdir'); | ||
| const { | ||
| getCpuProfiles, | ||
| kCpuProfInterval, | ||
| env, | ||
| verifyFrames | ||
| } = require('../common/cpu-prof'); | ||
|
|
||
| // Test --diagnostic-dir changes the default for --cpu-prof | ||
|
|
||
| { | ||
| tmpdir.refresh(); | ||
| const dir = path.join(tmpdir.path, 'prof'); | ||
| const output = spawnSync(process.execPath, [ | ||
| '--cpu-prof', | ||
| '--cpu-prof-interval', | ||
| kCpuProfInterval, | ||
| '--diagnostic-dir', | ||
| dir, | ||
| fixtures.path('workload', 'fibonacci.js'), | ||
| ], { | ||
| cwd: tmpdir.path, | ||
| env | ||
| }); | ||
| if (output.status !== 0) { | ||
| console.log(output.stderr.toString()); | ||
| } | ||
| assert.strictEqual(output.status, 0); | ||
| assert(fs.existsSync(dir)); | ||
| const profiles = getCpuProfiles(dir); | ||
| assert.strictEqual(profiles.length, 1); | ||
| verifyFrames(output, profiles[0], 'fibonacci.js'); | ||
| } | ||
|
|
||
| // Test --cpu-prof-dir overwrites --diagnostic-dir | ||
|
|
||
| { | ||
| tmpdir.refresh(); | ||
| const dir = path.join(tmpdir.path, 'diag'); | ||
| const dir2 = path.join(tmpdir.path, 'prof'); | ||
| const output = spawnSync(process.execPath, [ | ||
| '--cpu-prof', | ||
| '--cpu-prof-interval', | ||
| kCpuProfInterval, | ||
| '--diagnostic-dir', | ||
| dir, | ||
| '--cpu-prof-dir', | ||
| dir2, | ||
| fixtures.path('workload', 'fibonacci.js'), | ||
| ], { | ||
| cwd: tmpdir.path, | ||
| env | ||
| }); | ||
| if (output.status !== 0) { | ||
| console.log(output.stderr.toString()); | ||
| } | ||
| assert.strictEqual(output.status, 0); | ||
| assert(fs.existsSync(dir2)); | ||
| const profiles = getCpuProfiles(dir2); | ||
| assert.strictEqual(profiles.length, 1); | ||
| verifyFrames(output, profiles[0], 'fibonacci.js'); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| 'use strict'; | ||
|
|
||
| // This test is to ensure that --diagnostic-dir does not change the directory | ||
| // for --cpu-prof when --cpu-prof-dir is specified | ||
|
|
||
| const common = require('../common'); | ||
| const fixtures = require('../common/fixtures'); | ||
| common.skipIfInspectorDisabled(); | ||
|
|
||
| const assert = require('assert'); | ||
| const fs = require('fs'); | ||
| const path = require('path'); | ||
| const { spawnSync } = require('child_process'); | ||
|
|
||
| const tmpdir = require('../common/tmpdir'); | ||
|
|
||
| function findFirstFrameInNode(root, func) { | ||
| const first = root.children.find( | ||
| (child) => child.callFrame.functionName === func | ||
| ); | ||
| if (first) { | ||
| return first; | ||
| } | ||
| for (const child of root.children) { | ||
| const first = findFirstFrameInNode(child, func); | ||
| if (first) { | ||
| return first; | ||
| } | ||
| } | ||
| return undefined; | ||
| } | ||
|
|
||
| function findFirstFrame(file, func) { | ||
| const data = fs.readFileSync(file, 'utf8'); | ||
| const profile = JSON.parse(data); | ||
| const first = findFirstFrameInNode(profile.head, func); | ||
| return { frame: first, roots: profile.head.children }; | ||
| } | ||
|
|
||
| function verifyFrames(output, file, func) { | ||
| const { frame, roots } = findFirstFrame(file, func); | ||
| if (!frame) { | ||
| // Show native debug output and the profile for debugging. | ||
| console.log(output.stderr.toString()); | ||
| console.log(roots); | ||
| } | ||
| assert.notDeepStrictEqual(frame, undefined); | ||
| } | ||
|
|
||
| const kHeapProfInterval = 128; | ||
| const TEST_ALLOCATION = kHeapProfInterval * 2; | ||
|
|
||
| const env = { | ||
| ...process.env, | ||
| TEST_ALLOCATION, | ||
| NODE_DEBUG_NATIVE: 'INSPECTOR_PROFILER' | ||
| }; | ||
|
|
||
| function getHeapProfiles(dir) { | ||
| const list = fs.readdirSync(dir); | ||
| return list | ||
| .filter((file) => file.endsWith('.heapprofile')) | ||
| .map((file) => path.join(dir, file)); | ||
| } | ||
|
|
||
| // Test --diagnostic-dir changes the default for --cpu-prof | ||
| { | ||
| tmpdir.refresh(); | ||
| const dir = path.join(tmpdir.path, 'prof'); | ||
| const output = spawnSync(process.execPath, [ | ||
| '--heap-prof', | ||
| '--diagnostic-dir', | ||
| dir, | ||
| '--heap-prof-interval', | ||
| kHeapProfInterval, | ||
| fixtures.path('workload', 'allocation.js'), | ||
| ], { | ||
| cwd: tmpdir.path, | ||
| env | ||
| }); | ||
| if (output.status !== 0) { | ||
| console.log(output.stderr.toString()); | ||
| } | ||
| assert.strictEqual(output.status, 0); | ||
| assert(fs.existsSync(dir)); | ||
| const profiles = getHeapProfiles(dir); | ||
| assert.strictEqual(profiles.length, 1); | ||
| verifyFrames(output, profiles[0], 'runAllocation'); | ||
| } | ||
|
|
||
| // Test --heap-prof-dir overwrites --diagnostic-dir | ||
| { | ||
| tmpdir.refresh(); | ||
| const dir = path.join(tmpdir.path, 'diag'); | ||
| const dir2 = path.join(tmpdir.path, 'prof'); | ||
| const output = spawnSync(process.execPath, [ | ||
| '--heap-prof', | ||
| '--heap-prof-interval', | ||
| kHeapProfInterval, | ||
| '--diagnostic-dir', | ||
| dir, | ||
| '--heap-prof-dir', | ||
| dir2, | ||
| fixtures.path('workload', 'allocation.js'), | ||
| ], { | ||
| cwd: tmpdir.path, | ||
| env | ||
| }); | ||
| if (output.status !== 0) { | ||
| console.log(output.stderr.toString()); | ||
| } | ||
| assert.strictEqual(output.status, 0); | ||
| assert(fs.existsSync(dir2)); | ||
| const profiles = getHeapProfiles(dir2); | ||
| assert.strictEqual(profiles.length, 1); | ||
| verifyFrames(output, profiles[0], 'runAllocation'); | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.