Skip to content

Commit 975931d

Browse files
legendecasdanielleadams
legendecas
authored and
danielleadams
committed
src: nest namespace report in namespace node
PR-URL: #44069 Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Feng Yu <F3n67u@outlook.com> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
1 parent 02e10a5 commit 975931d

File tree

4 files changed

+53
-57
lines changed

4 files changed

+53
-57
lines changed

‎src/node_report.cc

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,9 @@ constexpr int NODE_REPORT_VERSION = 2;
2727
constexpr int NANOS_PER_SEC = 1000 * 1000 * 1000;
2828
constexpr double SEC_PER_MICROS = 1e-6;
2929

30+
namespace node {
3031
namespace report {
31-
using node::arraysize;
32-
using node::ConditionVariable;
33-
using node::DiagnosticFilename;
34-
using node::Environment;
35-
using node::JSONWriter;
36-
using node::Mutex;
37-
using node::NativeSymbolDebuggingContext;
38-
using node::TIME_TYPE;
32+
3933
using node::worker::Worker;
4034
using v8::Array;
4135
using v8::Context;
@@ -54,8 +48,6 @@ using v8::TryCatch;
5448
using v8::V8;
5549
using v8::Value;
5650

57-
namespace per_process = node::per_process;
58-
5951
// Internal/static function declarations
6052
static void WriteNodeReport(Isolate* isolate,
6153
Environment* env,
@@ -129,7 +121,7 @@ std::string TriggerNodeReport(Isolate* isolate,
129121
// Regular file. Append filename to directory path if one was specified
130122
if (report_directory.length() > 0) {
131123
std::string pathname = report_directory;
132-
pathname += node::kPathSeparator;
124+
pathname += kPathSeparator;
133125
pathname += filename;
134126
outfile.open(pathname, std::ios::out | std::ios::binary);
135127
} else {
@@ -260,9 +252,9 @@ static void WriteNodeReport(Isolate* isolate,
260252
}
261253

262254
// Report out the command line.
263-
if (!node::per_process::cli_options->cmdline.empty()) {
255+
if (!per_process::cli_options->cmdline.empty()) {
264256
writer.json_arraystart("commandLine");
265-
for (const std::string& arg : node::per_process::cli_options->cmdline) {
257+
for (const std::string& arg : per_process::cli_options->cmdline) {
266258
writer.json_element(arg);
267259
}
268260
writer.json_arrayend();
@@ -377,8 +369,8 @@ static void PrintVersionInformation(JSONWriter* writer) {
377369

378370
// Report Process word size
379371
writer->json_keyvalue("wordSize", sizeof(void*) * 8);
380-
writer->json_keyvalue("arch", node::per_process::metadata.arch);
381-
writer->json_keyvalue("platform", node::per_process::metadata.platform);
372+
writer->json_keyvalue("arch", per_process::metadata.arch);
373+
writer->json_keyvalue("platform", per_process::metadata.platform);
382374

383375
// Report deps component versions
384376
PrintComponentVersions(writer);
@@ -528,7 +520,7 @@ static Maybe<std::string> ErrorToString(Isolate* isolate,
528520
maybe_str = error->ToString(context);
529521
} else if (error->IsObject()) {
530522
MaybeLocal<Value> stack = error.As<Object>()->Get(
531-
context, node::FIXED_ONE_BYTE_STRING(isolate, "stack"));
523+
context, FIXED_ONE_BYTE_STRING(isolate, "stack"));
532524
if (!stack.IsEmpty() && stack.ToLocalChecked()->IsString()) {
533525
maybe_str = stack.ToLocalChecked().As<String>();
534526
}
@@ -656,7 +648,7 @@ static void PrintGCStatistics(JSONWriter* writer, Isolate* isolate) {
656648
static void PrintResourceUsage(JSONWriter* writer) {
657649
// Get process uptime in seconds
658650
uint64_t uptime =
659-
(uv_hrtime() - node::per_process::node_start_time) / (NANOS_PER_SEC);
651+
(uv_hrtime() - per_process::node_start_time) / (NANOS_PER_SEC);
660652
if (uptime == 0) uptime = 1; // avoid division by zero.
661653

662654
// Process and current thread usage statistics
@@ -714,7 +706,7 @@ static void PrintSystemInformation(JSONWriter* writer) {
714706
writer->json_objectstart("environmentVariables");
715707

716708
{
717-
Mutex::ScopedLock lock(node::per_process::env_var_mutex);
709+
Mutex::ScopedLock lock(per_process::env_var_mutex);
718710
r = uv_os_environ(&envitems, &envcount);
719711
}
720712

@@ -794,8 +786,7 @@ static void PrintComponentVersions(JSONWriter* writer) {
794786

795787
writer->json_objectstart("componentVersions");
796788

797-
#define V(key) \
798-
writer->json_keyvalue(#key, node::per_process::metadata.versions.key);
789+
#define V(key) writer->json_keyvalue(#key, per_process::metadata.versions.key);
799790
NODE_VERSIONS_KEYS(V)
800791
#undef V
801792

@@ -805,22 +796,22 @@ static void PrintComponentVersions(JSONWriter* writer) {
805796
// Report runtime release information.
806797
static void PrintRelease(JSONWriter* writer) {
807798
writer->json_objectstart("release");
808-
writer->json_keyvalue("name", node::per_process::metadata.release.name);
799+
writer->json_keyvalue("name", per_process::metadata.release.name);
809800
#if NODE_VERSION_IS_LTS
810-
writer->json_keyvalue("lts", node::per_process::metadata.release.lts);
801+
writer->json_keyvalue("lts", per_process::metadata.release.lts);
811802
#endif
812803

813804
#ifdef NODE_HAS_RELEASE_URLS
814805
writer->json_keyvalue("headersUrl",
815-
node::per_process::metadata.release.headers_url);
816-
writer->json_keyvalue("sourceUrl",
817-
node::per_process::metadata.release.source_url);
806+
per_process::metadata.release.headers_url);
807+
writer->json_keyvalue("sourceUrl", per_process::metadata.release.source_url);
818808
#ifdef _WIN32
819-
writer->json_keyvalue("libUrl", node::per_process::metadata.release.lib_url);
809+
writer->json_keyvalue("libUrl", per_process::metadata.release.lib_url);
820810
#endif // _WIN32
821811
#endif // NODE_HAS_RELEASE_URLS
822812

823813
writer->json_objectend();
824814
}
825815

826816
} // namespace report
817+
} // namespace node

‎src/node_report.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
#pragma once
1+
#ifndef SRC_NODE_REPORT_H_
2+
#define SRC_NODE_REPORT_H_
3+
4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
25

36
#include "node.h"
47
#include "node_buffer.h"
@@ -12,17 +15,18 @@
1215

1316
#include <iomanip>
1417

18+
namespace node {
1519
namespace report {
1620

1721
// Function declarations - functions in src/node_report.cc
1822
std::string TriggerNodeReport(v8::Isolate* isolate,
19-
node::Environment* env,
23+
Environment* env,
2024
const char* message,
2125
const char* trigger,
2226
const std::string& name,
2327
v8::Local<v8::Value> error);
2428
void GetNodeReport(v8::Isolate* isolate,
25-
node::Environment* env,
29+
Environment* env,
2630
const char* message,
2731
const char* trigger,
2832
v8::Local<v8::Value> error,
@@ -45,3 +49,8 @@ void WriteReport(const v8::FunctionCallbackInfo<v8::Value>& info);
4549
void GetReport(const v8::FunctionCallbackInfo<v8::Value>& info);
4650

4751
} // namespace report
52+
} // namespace node
53+
54+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55+
56+
#endif // SRC_NODE_REPORT_H_

‎src/node_report_module.cc

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
#include <atomic>
1616
#include <sstream>
1717

18+
namespace node {
1819
namespace report {
19-
using node::Environment;
20-
using node::Mutex;
21-
using node::Utf8Value;
2220
using v8::Context;
2321
using v8::FunctionCallbackInfo;
2422
using v8::HandleScope;
@@ -76,48 +74,48 @@ void GetReport(const FunctionCallbackInfo<Value>& info) {
7674
}
7775

7876
static void GetCompact(const FunctionCallbackInfo<Value>& info) {
79-
node::Mutex::ScopedLock lock(node::per_process::cli_options_mutex);
80-
info.GetReturnValue().Set(node::per_process::cli_options->report_compact);
77+
Mutex::ScopedLock lock(per_process::cli_options_mutex);
78+
info.GetReturnValue().Set(per_process::cli_options->report_compact);
8179
}
8280

8381
static void SetCompact(const FunctionCallbackInfo<Value>& info) {
84-
node::Mutex::ScopedLock lock(node::per_process::cli_options_mutex);
82+
Mutex::ScopedLock lock(per_process::cli_options_mutex);
8583
Environment* env = Environment::GetCurrent(info);
8684
Isolate* isolate = env->isolate();
8785
bool compact = info[0]->ToBoolean(isolate)->Value();
88-
node::per_process::cli_options->report_compact = compact;
86+
per_process::cli_options->report_compact = compact;
8987
}
9088

9189
static void GetDirectory(const FunctionCallbackInfo<Value>& info) {
92-
node::Mutex::ScopedLock lock(node::per_process::cli_options_mutex);
90+
Mutex::ScopedLock lock(per_process::cli_options_mutex);
9391
Environment* env = Environment::GetCurrent(info);
94-
std::string directory = node::per_process::cli_options->report_directory;
92+
std::string directory = per_process::cli_options->report_directory;
9593
auto result = String::NewFromUtf8(env->isolate(), directory.c_str());
9694
info.GetReturnValue().Set(result.ToLocalChecked());
9795
}
9896

9997
static void SetDirectory(const FunctionCallbackInfo<Value>& info) {
100-
node::Mutex::ScopedLock lock(node::per_process::cli_options_mutex);
98+
Mutex::ScopedLock lock(per_process::cli_options_mutex);
10199
Environment* env = Environment::GetCurrent(info);
102100
CHECK(info[0]->IsString());
103101
Utf8Value dir(env->isolate(), info[0].As<String>());
104-
node::per_process::cli_options->report_directory = *dir;
102+
per_process::cli_options->report_directory = *dir;
105103
}
106104

107105
static void GetFilename(const FunctionCallbackInfo<Value>& info) {
108-
node::Mutex::ScopedLock lock(node::per_process::cli_options_mutex);
106+
Mutex::ScopedLock lock(per_process::cli_options_mutex);
109107
Environment* env = Environment::GetCurrent(info);
110-
std::string filename = node::per_process::cli_options->report_filename;
108+
std::string filename = per_process::cli_options->report_filename;
111109
auto result = String::NewFromUtf8(env->isolate(), filename.c_str());
112110
info.GetReturnValue().Set(result.ToLocalChecked());
113111
}
114112

115113
static void SetFilename(const FunctionCallbackInfo<Value>& info) {
116-
node::Mutex::ScopedLock lock(node::per_process::cli_options_mutex);
114+
Mutex::ScopedLock lock(per_process::cli_options_mutex);
117115
Environment* env = Environment::GetCurrent(info);
118116
CHECK(info[0]->IsString());
119117
Utf8Value name(env->isolate(), info[0].As<String>());
120-
node::per_process::cli_options->report_filename = *name;
118+
per_process::cli_options->report_filename = *name;
121119
}
122120

123121
static void GetSignal(const FunctionCallbackInfo<Value>& info) {
@@ -135,15 +133,14 @@ static void SetSignal(const FunctionCallbackInfo<Value>& info) {
135133
}
136134

137135
static void ShouldReportOnFatalError(const FunctionCallbackInfo<Value>& info) {
138-
Mutex::ScopedLock lock(node::per_process::cli_options_mutex);
139-
info.GetReturnValue().Set(
140-
node::per_process::cli_options->report_on_fatalerror);
136+
Mutex::ScopedLock lock(per_process::cli_options_mutex);
137+
info.GetReturnValue().Set(per_process::cli_options->report_on_fatalerror);
141138
}
142139

143140
static void SetReportOnFatalError(const FunctionCallbackInfo<Value>& info) {
144141
CHECK(info[0]->IsBoolean());
145-
Mutex::ScopedLock lock(node::per_process::cli_options_mutex);
146-
node::per_process::cli_options->report_on_fatalerror = info[0]->IsTrue();
142+
Mutex::ScopedLock lock(per_process::cli_options_mutex);
143+
per_process::cli_options->report_on_fatalerror = info[0]->IsTrue();
147144
}
148145

149146
static void ShouldReportOnSignal(const FunctionCallbackInfo<Value>& info) {
@@ -197,7 +194,7 @@ static void Initialize(Local<Object> exports,
197194
SetReportOnUncaughtException);
198195
}
199196

200-
void RegisterExternalReferences(node::ExternalReferenceRegistry* registry) {
197+
void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
201198
registry->Register(WriteReport);
202199
registry->Register(GetReport);
203200
registry->Register(GetCompact);
@@ -217,6 +214,7 @@ void RegisterExternalReferences(node::ExternalReferenceRegistry* registry) {
217214
}
218215

219216
} // namespace report
217+
} // namespace node
220218

221-
NODE_MODULE_CONTEXT_AWARE_INTERNAL(report, report::Initialize)
222-
NODE_MODULE_EXTERNAL_REFERENCE(report, report::RegisterExternalReferences)
219+
NODE_MODULE_CONTEXT_AWARE_INTERNAL(report, node::report::Initialize)
220+
NODE_MODULE_EXTERNAL_REFERENCE(report, node::report::RegisterExternalReferences)

‎src/node_report_utils.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
#include "node_report.h"
44
#include "util-inl.h"
55

6+
namespace node {
67
namespace report {
78

8-
using node::JSONWriter;
9-
using node::MallocedBuffer;
10-
119
static constexpr auto null = JSONWriter::Null{};
1210

1311
// Utility function to format socket information.
@@ -210,8 +208,7 @@ void WalkHandle(uv_handle_t* h, void* arg) {
210208
// SIGWINCH is used by libuv so always appears.
211209
// See http://docs.libuv.org/en/v1.x/signal.html
212210
writer->json_keyvalue("signum", handle->signal.signum);
213-
writer->json_keyvalue("signal",
214-
node::signo_string(handle->signal.signum));
211+
writer->json_keyvalue("signal", signo_string(handle->signal.signum));
215212
break;
216213
default:
217214
break;
@@ -269,3 +266,4 @@ void WalkHandle(uv_handle_t* h, void* arg) {
269266
}
270267

271268
} // namespace report
269+
} // namespace node

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy