Skip to content

Commit 075936b

Browse files
iknoomaddaleax
iknoom
authored and
addaleax
committed
src: use std::string_view from node_report
PR-URL: #60006 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Chengzhong Wu <[email protected]> Reviewed-By: Daeyeon Jeong <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent 93ee08c commit 075936b

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎src/node.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -794,23 +794,23 @@ NODE_EXTERN v8::MaybeLocal<v8::Value> PrepareStackTraceCallback(
794794
// is included in the report.
795795
// Returns the filename of the written report.
796796
NODE_EXTERN std::string TriggerNodeReport(v8::Isolate* isolate,
797-
const char* message,
798-
const char* trigger,
799-
const std::string& filename,
797+
std::string_view message,
798+
std::string_view trigger,
799+
std::string_view filename,
800800
v8::Local<v8::Value> error);
801801
NODE_EXTERN std::string TriggerNodeReport(Environment* env,
802-
const char* message,
803-
const char* trigger,
804-
const std::string& filename,
802+
std::string_view message,
803+
std::string_view trigger,
804+
std::string_view filename,
805805
v8::Local<v8::Value> error);
806806
NODE_EXTERN void GetNodeReport(v8::Isolate* isolate,
807-
const char* message,
808-
const char* trigger,
807+
std::string_view message,
808+
std::string_view trigger,
809809
v8::Local<v8::Value> error,
810810
std::ostream& out);
811811
NODE_EXTERN void GetNodeReport(Environment* env,
812-
const char* message,
813-
const char* trigger,
812+
std::string_view message,
813+
std::string_view trigger,
814814
v8::Local<v8::Value> error,
815815
std::ostream& out);
816816

‎src/node_errors.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ static void ReportFatalException(Environment* env,
553553
}
554554

555555
if (env->isolate_data()->options()->report_uncaught_exception) {
556-
TriggerNodeReport(env, report_message.c_str(), "Exception", "", error);
556+
TriggerNodeReport(env, report_message, "Exception", "", error);
557557
}
558558

559559
if (env->options()->trace_uncaught) {

‎src/node_report.cc‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ namespace report {
5656
// Internal/static function declarations
5757
static void WriteNodeReport(Isolate* isolate,
5858
Environment* env,
59-
const char* message,
60-
const char* trigger,
61-
const std::string& filename,
59+
std::string_view message,
60+
std::string_view trigger,
61+
std::string_view filename,
6262
std::ostream& out,
6363
Local<Value> error,
6464
bool compact,
@@ -69,11 +69,11 @@ static void PrintVersionInformation(JSONWriter* writer,
6969
static void PrintJavaScriptErrorStack(JSONWriter* writer,
7070
Isolate* isolate,
7171
Local<Value> error,
72-
const char* trigger);
72+
std::string_view trigger);
7373
static void PrintEmptyJavaScriptStack(JSONWriter* writer);
7474
static void PrintJavaScriptStack(JSONWriter* writer,
7575
Isolate* isolate,
76-
const char* trigger);
76+
std::string_view trigger);
7777
static void PrintJavaScriptErrorProperties(JSONWriter* writer,
7878
Isolate* isolate,
7979
Local<Value> error);
@@ -92,9 +92,9 @@ static void PrintNetworkInterfaceInfo(JSONWriter* writer);
9292
// sections of the report to the supplied stream
9393
static void WriteNodeReport(Isolate* isolate,
9494
Environment* env,
95-
const char* message,
96-
const char* trigger,
97-
const std::string& filename,
95+
std::string_view message,
96+
std::string_view trigger,
97+
std::string_view filename,
9898
std::ostream& out,
9999
Local<Value> error,
100100
bool compact,
@@ -237,7 +237,7 @@ static void WriteNodeReport(Isolate* isolate,
237237
std::ostringstream os;
238238
std::string name =
239239
"Worker thread subreport [" + std::string(w->name()) + "]";
240-
GetNodeReport(env, name.c_str(), trigger, Local<Value>(), os);
240+
GetNodeReport(env, name, trigger, Local<Value>(), os);
241241

242242
Mutex::ScopedLock lock(workers_mutex);
243243
worker_infos.emplace_back(os.str());
@@ -472,7 +472,7 @@ static void PrintEmptyJavaScriptStack(JSONWriter* writer) {
472472
// Do our best to report the JavaScript stack without calling into JavaScript.
473473
static void PrintJavaScriptStack(JSONWriter* writer,
474474
Isolate* isolate,
475-
const char* trigger) {
475+
std::string_view trigger) {
476476
HandleScope scope(isolate);
477477
Local<v8::StackTrace> stack;
478478
if (!GetCurrentStackTrace(isolate, MAX_FRAME_COUNT).ToLocal(&stack)) {
@@ -513,7 +513,7 @@ static void PrintJavaScriptStack(JSONWriter* writer,
513513
static void PrintJavaScriptErrorStack(JSONWriter* writer,
514514
Isolate* isolate,
515515
Local<Value> error,
516-
const char* trigger) {
516+
std::string_view trigger) {
517517
if (error.IsEmpty()) {
518518
return PrintJavaScriptStack(writer, isolate, trigger);
519519
}
@@ -828,23 +828,23 @@ static void PrintRelease(JSONWriter* writer) {
828828

829829
std::string TriggerNodeReport(Isolate* isolate,
830830
Environment* env,
831-
const char* message,
832-
const char* trigger,
833-
const std::string& name,
831+
std::string_view message,
832+
std::string_view trigger,
833+
std::string_view name,
834834
Local<Value> error) {
835835
std::string filename;
836836

837837
// Determine the required report filename. In order of priority:
838838
// 1) supplied on API 2) configured on startup 3) default generated
839839
if (!name.empty()) {
840+
filename = name;
840841
// we may not always be in a great state when generating a node report
841842
// allow for the case where we don't have an env
842843
if (env != nullptr) {
843844
THROW_IF_INSUFFICIENT_PERMISSIONS(
844-
env, permission::PermissionScope::kFileSystemWrite, name, name);
845+
env, permission::PermissionScope::kFileSystemWrite, name, filename);
845846
// Filename was specified as API parameter.
846847
}
847-
filename = name;
848848
} else {
849849
std::string report_filename;
850850
{
@@ -941,9 +941,9 @@ std::string TriggerNodeReport(Isolate* isolate,
941941

942942
// External function to trigger a report, writing to file.
943943
std::string TriggerNodeReport(Isolate* isolate,
944-
const char* message,
945-
const char* trigger,
946-
const std::string& name,
944+
std::string_view message,
945+
std::string_view trigger,
946+
std::string_view name,
947947
Local<Value> error) {
948948
Environment* env = nullptr;
949949
if (isolate != nullptr) {
@@ -954,9 +954,9 @@ std::string TriggerNodeReport(Isolate* isolate,
954954

955955
// External function to trigger a report, writing to file.
956956
std::string TriggerNodeReport(Environment* env,
957-
const char* message,
958-
const char* trigger,
959-
const std::string& name,
957+
std::string_view message,
958+
std::string_view trigger,
959+
std::string_view name,
960960
Local<Value> error) {
961961
return TriggerNodeReport(env != nullptr ? env->isolate() : nullptr,
962962
env,
@@ -968,8 +968,8 @@ std::string TriggerNodeReport(Environment* env,
968968

969969
// External function to trigger a report, writing to a supplied stream.
970970
void GetNodeReport(Isolate* isolate,
971-
const char* message,
972-
const char* trigger,
971+
std::string_view message,
972+
std::string_view trigger,
973973
Local<Value> error,
974974
std::ostream& out) {
975975
Environment* env = nullptr;
@@ -997,8 +997,8 @@ void GetNodeReport(Isolate* isolate,
997997

998998
// External function to trigger a report, writing to a supplied stream.
999999
void GetNodeReport(Environment* env,
1000-
const char* message,
1001-
const char* trigger,
1000+
std::string_view message,
1001+
std::string_view trigger,
10021002
Local<Value> error,
10031003
std::ostream& out) {
10041004
Isolate* isolate = nullptr;

0 commit comments

Comments
 (0)