Nodejs/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 10:59:27 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

report: disable js stack when no context is entered

Browse Source 
There are no guarantees that the JS stack can be generated when no
context is entered.

PR-URL: https://github.com/nodejs/node/pull/48495
Fixes: https://github.com/nodejs/node-v8/issues/250
Refs: https://chromium-review.googlesource.com/c/v8/v8/+/4582948
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
This commit is contained in:
Chengzhong Wu 2023-06-21 21:58:15 +08:00 committed by GitHub
parent 198affc639
commit a509753a8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/node_report.cc
View File

@ -66,6 +66,7 @@ static void PrintJavaScriptErrorStack(JSONWriter* writer,
Isolate* isolate,
Local<Value> error,
const char* trigger);
static void PrintEmptyJavaScriptStack(JSONWriter* writer);
static void PrintJavaScriptStack(JSONWriter* writer,
Isolate* isolate,
const char* trigger);
@ -184,6 +185,10 @@ static void WriteNodeReport(Isolate* isolate,
// Report V8 Heap and Garbage Collector information
PrintGCStatistics(&writer, isolate);
} else {
writer.json_objectstart("javascriptStack");
PrintEmptyJavaScriptStack(&writer);
writer.json_objectend(); // the end of 'javascriptStack'
}
// Report native stack backtrace
@ -452,8 +457,9 @@ static void PrintEmptyJavaScriptStack(JSONWriter* writer) {
static void PrintJavaScriptStack(JSONWriter* writer,
Isolate* isolate,
const char* trigger) {
// Can not capture the stacktrace when the isolate is in a OOM state.
if (!strcmp(trigger, "OOMError")) {
// Can not capture the stacktrace when the isolate is in a OOM state or no
// context is entered.
if (!strcmp(trigger, "OOMError") || !isolate->InContext()) {
PrintEmptyJavaScriptStack(writer);
return;
}

12
test/addons/report-api/test.js
View File

@ -9,7 +9,7 @@ const tmpdir = require('../../common/tmpdir');
const binding = path.resolve(__dirname, `./build/${common.buildType}/binding`);
const addon = require(binding);
function myAddonMain(method, { hasIsolate, hasEnv }) {
function myAddonMain(method, { hasContext, hasEnv }) {
tmpdir.refresh();
process.report.directory = tmpdir.path;
@ -27,10 +27,10 @@ function myAddonMain(method, { hasIsolate, hasEnv }) {
const content = require(report);
// Check that the javascript stack is present.
if (hasIsolate) {
if (hasContext) {
assert.strictEqual(content.javascriptStack.stack.findIndex((frame) => frame.match('myAddonMain')), 0);
} else {
assert.strictEqual(content.javascriptStack, undefined);
assert.strictEqual(content.javascriptStack.message, 'No stack.');
}
if (hasEnv) {
@ -45,9 +45,9 @@ const methods = [
['triggerReportNoIsolate', false, false],
['triggerReportEnv', true, true],
['triggerReportNoEnv', false, false],
['triggerReportNoContext', true, false],
['triggerReportNoContext', false, false],
['triggerReportNewContext', true, false],
];
for (const [method, hasIsolate, hasEnv] of methods) {
myAddonMain(method, { hasIsolate, hasEnv });
for (const [method, hasContext, hasEnv] of methods) {
myAddonMain(method, { hasContext, hasEnv });
}

8
test/common/report.js
View File

@ -55,11 +55,11 @@ function validateContent(report, fields = []) {
function _validateContent(report, fields = []) {
const isWindows = process.platform === 'win32';
const isJavaScriptThreadReport = report.javascriptStack != null;
const isJavaScriptThreadReport = report.javascriptHeap != null;
// Verify that all sections are present as own properties of the report.
const sections = ['header', 'nativeStack', 'libuv', 'environmentVariables',
'sharedObjects', 'resourceUsage', 'workers'];
const sections = ['header', 'nativeStack', 'javascriptStack', 'libuv',
'environmentVariables', 'sharedObjects', 'resourceUsage', 'workers'];
if (!isWindows)
sections.push('userLimits');
@ -67,7 +67,7 @@ function _validateContent(report, fields = []) {
sections.push('uvthreadResourceUsage');
if (isJavaScriptThreadReport)
sections.push('javascriptStack', 'javascriptHeap');
sections.push('javascriptHeap');
checkForUnknownFields(report, sections);
sections.forEach((section) => {