@@ -27,15 +27,9 @@ constexpr int NODE_REPORT_VERSION = 2; |
27 | 27 | constexpr int NANOS_PER_SEC = 1000 * 1000 * 1000; |
28 | 28 | constexpr double SEC_PER_MICROS = 1e-6; |
29 | 29 |
|
| 30 | +namespace node { |
30 | 31 | 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 | + |
39 | 33 | using node::worker::Worker; |
40 | 34 | using v8::Array; |
41 | 35 | using v8::Context; |
@@ -54,8 +48,6 @@ using v8::TryCatch; |
54 | 48 | using v8::V8; |
55 | 49 | using v8::Value; |
56 | 50 |
|
57 | | -namespace per_process = node::per_process; |
58 | | - |
59 | 51 | // Internal/static function declarations |
60 | 52 | static void WriteNodeReport(Isolate* isolate, |
61 | 53 | Environment* env, |
@@ -129,7 +121,7 @@ std::string TriggerNodeReport(Isolate* isolate, |
129 | 121 | // Regular file. Append filename to directory path if one was specified |
130 | 122 | if (report_directory.length() > 0) { |
131 | 123 | std::string pathname = report_directory; |
132 | | - pathname += node::kPathSeparator; |
| 124 | + pathname += kPathSeparator; |
133 | 125 | pathname += filename; |
134 | 126 | outfile.open(pathname, std::ios::out | std::ios::binary); |
135 | 127 | } else { |
@@ -260,9 +252,9 @@ static void WriteNodeReport(Isolate* isolate, |
260 | 252 | } |
261 | 253 |
|
262 | 254 | // Report out the command line. |
263 | | - if (!node::per_process::cli_options->cmdline.empty()) { |
| 255 | + if (!per_process::cli_options->cmdline.empty()) { |
264 | 256 | 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) { |
266 | 258 | writer.json_element(arg); |
267 | 259 | } |
268 | 260 | writer.json_arrayend(); |
@@ -377,8 +369,8 @@ static void PrintVersionInformation(JSONWriter* writer) { |
377 | 369 |
|
378 | 370 | // Report Process word size |
379 | 371 | 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); |
382 | 374 |
|
383 | 375 | // Report deps component versions |
384 | 376 | PrintComponentVersions(writer); |
@@ -528,7 +520,7 @@ static Maybe<std::string> ErrorToString(Isolate* isolate, |
528 | 520 | maybe_str = error->ToString(context); |
529 | 521 | } else if (error->IsObject()) { |
530 | 522 | MaybeLocal<Value> stack = error.As<Object>()->Get( |
531 | | - context, node::FIXED_ONE_BYTE_STRING(isolate, "stack")); |
| 523 | + context, FIXED_ONE_BYTE_STRING(isolate, "stack")); |
532 | 524 | if (!stack.IsEmpty() && stack.ToLocalChecked()->IsString()) { |
533 | 525 | maybe_str = stack.ToLocalChecked().As<String>(); |
534 | 526 | } |
@@ -656,7 +648,7 @@ static void PrintGCStatistics(JSONWriter* writer, Isolate* isolate) { |
656 | 648 | static void PrintResourceUsage(JSONWriter* writer) { |
657 | 649 | // Get process uptime in seconds |
658 | 650 | 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); |
660 | 652 | if (uptime == 0) uptime = 1; // avoid division by zero. |
661 | 653 |
|
662 | 654 | // Process and current thread usage statistics |
@@ -714,7 +706,7 @@ static void PrintSystemInformation(JSONWriter* writer) { |
714 | 706 | writer->json_objectstart("environmentVariables"); |
715 | 707 |
|
716 | 708 | { |
717 | | - Mutex::ScopedLock lock(node::per_process::env_var_mutex); |
| 709 | + Mutex::ScopedLock lock(per_process::env_var_mutex); |
718 | 710 | r = uv_os_environ(&envitems, &envcount); |
719 | 711 | } |
720 | 712 |
|
@@ -794,8 +786,7 @@ static void PrintComponentVersions(JSONWriter* writer) { |
794 | 786 |
|
795 | 787 | writer->json_objectstart("componentVersions"); |
796 | 788 |
|
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); |
799 | 790 | NODE_VERSIONS_KEYS(V) |
800 | 791 | #undef V |
801 | 792 |
|
@@ -805,22 +796,22 @@ static void PrintComponentVersions(JSONWriter* writer) { |
805 | 796 | // Report runtime release information. |
806 | 797 | static void PrintRelease(JSONWriter* writer) { |
807 | 798 | 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); |
809 | 800 | #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); |
811 | 802 | #endif |
812 | 803 |
|
813 | 804 | #ifdef NODE_HAS_RELEASE_URLS |
814 | 805 | 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); |
818 | 808 | #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); |
820 | 810 | #endif // _WIN32 |
821 | 811 | #endif // NODE_HAS_RELEASE_URLS |
822 | 812 |
|
823 | 813 | writer->json_objectend(); |
824 | 814 | } |
825 | 815 |
|
826 | 816 | } // namespace report |
| 817 | +} // namespace node |