summaryrefslogtreecommitdiff
path: root/src/node_report.cc
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2019-03-01 19:15:38 -0500
committercjihrig <cjihrig@gmail.com>2019-03-03 19:26:14 -0500
commit31be55203fd220142cdefdf957a5a71374c07876 (patch)
tree216b98d9eadea20d09892ce2d81bc2d7034f0be4 /src/node_report.cc
parentd4abe2fc6143bf2d059bbe366e6306a1d933b66c (diff)
downloadandroid-node-v8-31be55203fd220142cdefdf957a5a71374c07876.tar.gz
android-node-v8-31be55203fd220142cdefdf957a5a71374c07876.tar.bz2
android-node-v8-31be55203fd220142cdefdf957a5a71374c07876.zip
report: rename location to trigger
trigger more accurately describes the use of the field. Previously, location was just the name of the C++ function that called TriggerNodeReport(). PR-URL: https://github.com/nodejs/node/pull/26386 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src/node_report.cc')
-rw-r--r--src/node_report.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/node_report.cc b/src/node_report.cc
index 4617fb6271..85c66a51bf 100644
--- a/src/node_report.cc
+++ b/src/node_report.cc
@@ -70,7 +70,7 @@ using v8::Value;
static void WriteNodeReport(Isolate* isolate,
Environment* env,
const char* message,
- const char* location,
+ const char* trigger,
const std::string& filename,
std::ostream& out,
Local<String> stackstr,
@@ -79,7 +79,7 @@ static void PrintVersionInformation(JSONWriter* writer);
static void PrintJavaScriptStack(JSONWriter* writer,
Isolate* isolate,
Local<String> stackstr,
- const char* location);
+ const char* trigger);
static void PrintNativeStack(JSONWriter* writer);
#ifndef _WIN32
static void PrintResourceUsage(JSONWriter* writer);
@@ -100,7 +100,7 @@ static std::atomic_int seq = {0}; // sequence number for report filenames
std::string TriggerNodeReport(Isolate* isolate,
Environment* env,
const char* message,
- const char* location,
+ const char* trigger,
std::string name,
Local<String> stackstr) {
std::ostringstream oss;
@@ -178,7 +178,7 @@ std::string TriggerNodeReport(Isolate* isolate,
<< "Writing Node.js report to file: " << filename << std::endl;
}
- WriteNodeReport(isolate, env, message, location, filename, *outstream,
+ WriteNodeReport(isolate, env, message, trigger, filename, *outstream,
stackstr, &tm_struct);
// Do not close stdout/stderr, only close files we opened.
@@ -194,14 +194,14 @@ std::string TriggerNodeReport(Isolate* isolate,
void GetNodeReport(Isolate* isolate,
Environment* env,
const char* message,
- const char* location,
+ const char* trigger,
Local<String> stackstr,
std::ostream& out) {
// Obtain the current time and the pid (platform dependent)
TIME_TYPE tm_struct;
LocalTime(&tm_struct);
WriteNodeReport(
- isolate, env, message, location, "", out, stackstr, &tm_struct);
+ isolate, env, message, trigger, "", out, stackstr, &tm_struct);
}
// Internal function to coordinate and write the various
@@ -209,7 +209,7 @@ void GetNodeReport(Isolate* isolate,
static void WriteNodeReport(Isolate* isolate,
Environment* env,
const char* message,
- const char* location,
+ const char* trigger,
const std::string& filename,
std::ostream& out,
Local<String> stackstr,
@@ -228,7 +228,7 @@ static void WriteNodeReport(Isolate* isolate,
writer.json_objectstart("header");
writer.json_keyvalue("event", message);
- writer.json_keyvalue("location", location);
+ writer.json_keyvalue("trigger", trigger);
if (!filename.empty())
writer.json_keyvalue("filename", filename);
else
@@ -280,7 +280,7 @@ static void WriteNodeReport(Isolate* isolate,
writer.json_objectend();
// Report summary JavaScript stack backtrace
- PrintJavaScriptStack(&writer, isolate, stackstr, location);
+ PrintJavaScriptStack(&writer, isolate, stackstr, trigger);
// Report native stack backtrace
PrintNativeStack(&writer);
@@ -372,12 +372,12 @@ static void PrintVersionInformation(JSONWriter* writer) {
static void PrintJavaScriptStack(JSONWriter* writer,
Isolate* isolate,
Local<String> stackstr,
- const char* location) {
+ const char* trigger) {
writer->json_objectstart("javascriptStack");
std::string ss;
- if ((!strcmp(location, "OnFatalError")) ||
- (!strcmp(location, "Signal"))) {
+ if ((!strcmp(trigger, "FatalError")) ||
+ (!strcmp(trigger, "Signal"))) {
ss = "No stack.\nUnavailable.\n";
} else {
String::Utf8Value sv(isolate, stackstr);