diff options
| -rw-r--r-- | node.gyp | 1 | ||||
| -rw-r--r-- | src/env.cc | 1 | ||||
| -rw-r--r-- | src/inspector/tracing_agent.cc | 1 | ||||
| -rw-r--r-- | src/node.cc | 196 | ||||
| -rw-r--r-- | src/node_internals.h | 3 | ||||
| -rw-r--r-- | src/node_trace_events.cc | 6 | ||||
| -rw-r--r-- | src/node_v8_platform-inl.h | 178 |
7 files changed, 201 insertions, 185 deletions
@@ -493,6 +493,7 @@ 'src/node_union_bytes.h', 'src/node_url.h', 'src/node_version.h', + 'src/node_v8_platform-inl.h', 'src/node_watchdog.h', 'src/node_worker.h', 'src/pipe_wrap.h', diff --git a/src/env.cc b/src/env.cc index 8ecab92df7..137dc83b76 100644 --- a/src/env.cc +++ b/src/env.cc @@ -8,6 +8,7 @@ #include "node_options-inl.h" #include "node_platform.h" #include "node_process.h" +#include "node_v8_platform-inl.h" #include "node_worker.h" #include "tracing/agent.h" #include "tracing/traced_value.h" diff --git a/src/inspector/tracing_agent.cc b/src/inspector/tracing_agent.cc index 79fccbf8aa..fb8467a1b9 100644 --- a/src/inspector/tracing_agent.cc +++ b/src/inspector/tracing_agent.cc @@ -1,6 +1,7 @@ #include "tracing_agent.h" #include "main_thread_interface.h" #include "node_internals.h" +#include "node_v8_platform-inl.h" #include "env-inl.h" #include "v8.h" diff --git a/src/node.cc b/src/node.cc index e67b16af83..b9f4403829 100644 --- a/src/node.cc +++ b/src/node.cc @@ -32,8 +32,8 @@ #include "node_platform.h" #include "node_process.h" #include "node_revert.h" +#include "node_v8_platform-inl.h" #include "node_version.h" -#include "tracing/traced_value.h" #if HAVE_OPENSSL #include "node_crypto.h" @@ -56,8 +56,6 @@ #include "handle_wrap.h" #include "req_wrap-inl.h" #include "string_bytes.h" -#include "tracing/agent.h" -#include "tracing/node_trace_writer.h" #include "util.h" #include "uv.h" #if NODE_USE_V8_PLATFORM @@ -165,169 +163,10 @@ bool v8_initialized = false; // node_internals.h // process-relative uptime base, initialized at start-up double prog_start_time; -} // namespace per_process - -// Ensures that __metadata trace events are only emitted -// when tracing is enabled. -class NodeTraceStateObserver : - public TracingController::TraceStateObserver { - public: - void OnTraceEnabled() override { - char name_buffer[512]; - if (uv_get_process_title(name_buffer, sizeof(name_buffer)) == 0) { - // Only emit the metadata event if the title can be retrieved - // successfully. Ignore it otherwise. - TRACE_EVENT_METADATA1("__metadata", "process_name", - "name", TRACE_STR_COPY(name_buffer)); - } - TRACE_EVENT_METADATA1("__metadata", - "version", - "node", - per_process::metadata.versions.node.c_str()); - TRACE_EVENT_METADATA1("__metadata", "thread_name", - "name", "JavaScriptMainThread"); - - auto trace_process = tracing::TracedValue::Create(); - trace_process->BeginDictionary("versions"); - -#define V(key) \ - trace_process->SetString(#key, per_process::metadata.versions.key.c_str()); - - NODE_VERSIONS_KEYS(V) -#undef V - - trace_process->EndDictionary(); - - trace_process->SetString("arch", per_process::metadata.arch.c_str()); - trace_process->SetString("platform", - per_process::metadata.platform.c_str()); - - trace_process->BeginDictionary("release"); - trace_process->SetString("name", - per_process::metadata.release.name.c_str()); -#if NODE_VERSION_IS_LTS - trace_process->SetString("lts", per_process::metadata.release.lts.c_str()); -#endif - trace_process->EndDictionary(); - TRACE_EVENT_METADATA1("__metadata", "node", - "process", std::move(trace_process)); - - // This only runs the first time tracing is enabled - controller_->RemoveTraceStateObserver(this); - } - - void OnTraceDisabled() override { - // Do nothing here. This should never be called because the - // observer removes itself when OnTraceEnabled() is called. - UNREACHABLE(); - } - - explicit NodeTraceStateObserver(TracingController* controller) : - controller_(controller) {} - ~NodeTraceStateObserver() override {} - - private: - TracingController* controller_; -}; - -static struct { -#if NODE_USE_V8_PLATFORM - void Initialize(int thread_pool_size) { - tracing_agent_.reset(new tracing::Agent()); - node::tracing::TraceEventHelper::SetAgent(tracing_agent_.get()); - node::tracing::TracingController* controller = - tracing_agent_->GetTracingController(); - trace_state_observer_.reset(new NodeTraceStateObserver(controller)); - controller->AddTraceStateObserver(trace_state_observer_.get()); - StartTracingAgent(); - // Tracing must be initialized before platform threads are created. - platform_ = new NodePlatform(thread_pool_size, controller); - V8::InitializePlatform(platform_); - } - - void Dispose() { - StopTracingAgent(); - platform_->Shutdown(); - delete platform_; - platform_ = nullptr; - // Destroy tracing after the platform (and platform threads) have been - // stopped. - tracing_agent_.reset(nullptr); - trace_state_observer_.reset(nullptr); - } - - void DrainVMTasks(Isolate* isolate) { - platform_->DrainTasks(isolate); - } - void CancelVMTasks(Isolate* isolate) { - platform_->CancelPendingDelayedTasks(isolate); - } - - void StartTracingAgent() { - if (per_process::cli_options->trace_event_categories.empty()) { - tracing_file_writer_ = tracing_agent_->DefaultHandle(); - } else { - std::vector<std::string> categories = - SplitString(per_process::cli_options->trace_event_categories, ','); - - tracing_file_writer_ = tracing_agent_->AddClient( - std::set<std::string>(std::make_move_iterator(categories.begin()), - std::make_move_iterator(categories.end())), - std::unique_ptr<tracing::AsyncTraceWriter>( - new tracing::NodeTraceWriter( - per_process::cli_options->trace_event_file_pattern)), - tracing::Agent::kUseDefaultCategories); - } - } - - void StopTracingAgent() { - tracing_file_writer_.reset(); - } - - tracing::AgentWriterHandle* GetTracingAgentWriter() { - return &tracing_file_writer_; - } - - NodePlatform* Platform() { - return platform_; - } - - std::unique_ptr<NodeTraceStateObserver> trace_state_observer_; - std::unique_ptr<tracing::Agent> tracing_agent_; - tracing::AgentWriterHandle tracing_file_writer_; - NodePlatform* platform_; -#else // !NODE_USE_V8_PLATFORM - void Initialize(int thread_pool_size) {} - void Dispose() {} - void DrainVMTasks(Isolate* isolate) {} - void CancelVMTasks(Isolate* isolate) {} - - void StartTracingAgent() { - if (!trace_enabled_categories.empty()) { - fprintf(stderr, "Node compiled with NODE_USE_V8_PLATFORM=0, " - "so event tracing is not available.\n"); - } - } - void StopTracingAgent() {} - - tracing::AgentWriterHandle* GetTracingAgentWriter() { - return nullptr; - } - - NodePlatform* Platform() { - return nullptr; - } -#endif // !NODE_USE_V8_PLATFORM -} v8_platform; - -tracing::AgentWriterHandle* GetTracingAgentWriter() { - return v8_platform.GetTracingAgentWriter(); -} - -void DisposePlatform() { - v8_platform.Dispose(); -} +// node_v8_platform-inl.h +struct V8Platform v8_platform; +} // namespace per_process #ifdef __POSIX__ static const unsigned kMaxSignal = 32; @@ -1258,7 +1097,7 @@ Environment* GetCurrentEnvironment(Local<Context> context) { MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform() { - return v8_platform.Platform(); + return per_process::v8_platform.Platform(); } @@ -1270,8 +1109,8 @@ MultiIsolatePlatform* CreatePlatform( MultiIsolatePlatform* InitializeV8Platform(int thread_pool_size) { - v8_platform.Initialize(thread_pool_size); - return v8_platform.Platform(); + per_process::v8_platform.Initialize(thread_pool_size); + return per_process::v8_platform.Platform(); } @@ -1359,7 +1198,7 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, do { uv_run(env.event_loop(), UV_RUN_DEFAULT); - v8_platform.DrainVMTasks(isolate); + per_process::v8_platform.DrainVMTasks(isolate); more = uv_loop_alive(env.event_loop()); if (more) @@ -1387,8 +1226,8 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, env.RunCleanup(); RunAtExit(&env); - v8_platform.DrainVMTasks(isolate); - v8_platform.CancelVMTasks(isolate); + per_process::v8_platform.DrainVMTasks(isolate); + per_process::v8_platform.CancelVMTasks(isolate); #if defined(LEAK_SANITIZER) __lsan_do_leak_check(); #endif @@ -1416,7 +1255,7 @@ Isolate* NewIsolate(ArrayBufferAllocator* allocator, uv_loop_t* event_loop) { // Register the isolate on the platform before the isolate gets initialized, // so that the isolate can access the platform during initialization. - v8_platform.Platform()->RegisterIsolate(isolate, event_loop); + per_process::v8_platform.Platform()->RegisterIsolate(isolate, event_loop); Isolate::Initialize(isolate, params); isolate->AddMessageListenerWithErrorLevel(OnMessage, @@ -1462,11 +1301,10 @@ inline int Start(uv_loop_t* event_loop, Isolate::Scope isolate_scope(isolate); HandleScope handle_scope(isolate); std::unique_ptr<IsolateData, decltype(&FreeIsolateData)> isolate_data( - CreateIsolateData( - isolate, - event_loop, - v8_platform.Platform(), - allocator.get()), + CreateIsolateData(isolate, + event_loop, + per_process::v8_platform.Platform(), + allocator.get()), &FreeIsolateData); // TODO(addaleax): This should load a real per-Isolate option, currently // this is still effectively per-process. @@ -1484,7 +1322,7 @@ inline int Start(uv_loop_t* event_loop, } isolate->Dispose(); - v8_platform.Platform()->UnregisterIsolate(isolate); + per_process::v8_platform.Platform()->UnregisterIsolate(isolate); return exit_code; } @@ -1549,7 +1387,7 @@ int Start(int argc, char** argv) { // that happen to terminate during shutdown from being run unsafely. // Since uv_run cannot be called, uv_async handles held by the platform // will never be fully cleaned up. - v8_platform.Dispose(); + per_process::v8_platform.Dispose(); return exit_code; } diff --git a/src/node_internals.h b/src/node_internals.h index bf66c77e6f..d972e2e5bd 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -244,9 +244,6 @@ int ThreadPoolWork::CancelWork() { return uv_cancel(reinterpret_cast<uv_req_t*>(&work_req_)); } -tracing::AgentWriterHandle* GetTracingAgentWriter(); -void DisposePlatform(); - #define TRACING_CATEGORY_NODE "node" #define TRACING_CATEGORY_NODE1(one) \ TRACING_CATEGORY_NODE "," \ diff --git a/src/node_trace_events.cc b/src/node_trace_events.cc index 3c0f1cf68f..9538e75d2c 100644 --- a/src/node_trace_events.cc +++ b/src/node_trace_events.cc @@ -1,8 +1,8 @@ +#include "base_object-inl.h" +#include "env.h" #include "node.h" -#include "node_internals.h" +#include "node_v8_platform-inl.h" #include "tracing/agent.h" -#include "env.h" -#include "base_object-inl.h" #include <set> #include <string> diff --git a/src/node_v8_platform-inl.h b/src/node_v8_platform-inl.h new file mode 100644 index 0000000000..ed91ee3a02 --- /dev/null +++ b/src/node_v8_platform-inl.h @@ -0,0 +1,178 @@ +#ifndef SRC_NODE_V8_PLATFORM_INL_H_ +#define SRC_NODE_V8_PLATFORM_INL_H_ + +#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS + +#include "env-inl.h" +#include "node.h" +#include "node_metadata.h" +#include "node_options.h" +#include "tracing/node_trace_writer.h" +#include "tracing/trace_event.h" +#include "tracing/traced_value.h" + +namespace node { + +// Ensures that __metadata trace events are only emitted +// when tracing is enabled. +class NodeTraceStateObserver + : public v8::TracingController::TraceStateObserver { + public: + inline void OnTraceEnabled() override { + char name_buffer[512]; + if (uv_get_process_title(name_buffer, sizeof(name_buffer)) == 0) { + // Only emit the metadata event if the title can be retrieved + // successfully. Ignore it otherwise. + TRACE_EVENT_METADATA1( + "__metadata", "process_name", "name", TRACE_STR_COPY(name_buffer)); + } + TRACE_EVENT_METADATA1("__metadata", + "version", + "node", + per_process::metadata.versions.node.c_str()); + TRACE_EVENT_METADATA1( + "__metadata", "thread_name", "name", "JavaScriptMainThread"); + + auto trace_process = tracing::TracedValue::Create(); + trace_process->BeginDictionary("versions"); + +#define V(key) \ + trace_process->SetString(#key, per_process::metadata.versions.key.c_str()); + + NODE_VERSIONS_KEYS(V) +#undef V + + trace_process->EndDictionary(); + + trace_process->SetString("arch", per_process::metadata.arch.c_str()); + trace_process->SetString("platform", + per_process::metadata.platform.c_str()); + + trace_process->BeginDictionary("release"); + trace_process->SetString("name", + per_process::metadata.release.name.c_str()); +#if NODE_VERSION_IS_LTS + trace_process->SetString("lts", per_process::metadata.release.lts.c_str()); +#endif + trace_process->EndDictionary(); + TRACE_EVENT_METADATA1( + "__metadata", "node", "process", std::move(trace_process)); + + // This only runs the first time tracing is enabled + controller_->RemoveTraceStateObserver(this); + } + + inline void OnTraceDisabled() override { + // Do nothing here. This should never be called because the + // observer removes itself when OnTraceEnabled() is called. + UNREACHABLE(); + } + + explicit NodeTraceStateObserver(v8::TracingController* controller) + : controller_(controller) {} + ~NodeTraceStateObserver() override {} + + private: + v8::TracingController* controller_; +}; + +struct V8Platform { +#if NODE_USE_V8_PLATFORM + inline void Initialize(int thread_pool_size) { + tracing_agent_.reset(new tracing::Agent()); + node::tracing::TraceEventHelper::SetAgent(tracing_agent_.get()); + node::tracing::TracingController* controller = + tracing_agent_->GetTracingController(); + trace_state_observer_.reset(new NodeTraceStateObserver(controller)); + controller->AddTraceStateObserver(trace_state_observer_.get()); + StartTracingAgent(); + // Tracing must be initialized before platform threads are created. + platform_ = new NodePlatform(thread_pool_size, controller); + v8::V8::InitializePlatform(platform_); + } + + inline void Dispose() { + StopTracingAgent(); + platform_->Shutdown(); + delete platform_; + platform_ = nullptr; + // Destroy tracing after the platform (and platform threads) have been + // stopped. + tracing_agent_.reset(nullptr); + trace_state_observer_.reset(nullptr); + } + + inline void DrainVMTasks(v8::Isolate* isolate) { + platform_->DrainTasks(isolate); + } + + inline void CancelVMTasks(v8::Isolate* isolate) { + platform_->CancelPendingDelayedTasks(isolate); + } + + inline void StartTracingAgent() { + if (per_process::cli_options->trace_event_categories.empty()) { + tracing_file_writer_ = tracing_agent_->DefaultHandle(); + } else { + std::vector<std::string> categories = + SplitString(per_process::cli_options->trace_event_categories, ','); + + tracing_file_writer_ = tracing_agent_->AddClient( + std::set<std::string>(std::make_move_iterator(categories.begin()), + std::make_move_iterator(categories.end())), + std::unique_ptr<tracing::AsyncTraceWriter>( + new tracing::NodeTraceWriter( + per_process::cli_options->trace_event_file_pattern)), + tracing::Agent::kUseDefaultCategories); + } + } + + inline void StopTracingAgent() { tracing_file_writer_.reset(); } + + inline tracing::AgentWriterHandle* GetTracingAgentWriter() { + return &tracing_file_writer_; + } + + inline NodePlatform* Platform() { return platform_; } + + std::unique_ptr<NodeTraceStateObserver> trace_state_observer_; + std::unique_ptr<tracing::Agent> tracing_agent_; + tracing::AgentWriterHandle tracing_file_writer_; + NodePlatform* platform_; +#else // !NODE_USE_V8_PLATFORM + inline void Initialize(int thread_pool_size) {} + inline void Dispose() {} + inline void DrainVMTasks(v8::Isolate* isolate) {} + inline void CancelVMTasks(v8::Isolate* isolate) {} + inline void StartTracingAgent() { + if (!trace_enabled_categories.empty()) { + fprintf(stderr, + "Node compiled with NODE_USE_V8_PLATFORM=0, " + "so event tracing is not available.\n"); + } + } + inline void StopTracingAgent() {} + + inline tracing::AgentWriterHandle* GetTracingAgentWriter() { return nullptr; } + + inline NodePlatform* Platform() { return nullptr; } +#endif // !NODE_USE_V8_PLATFORM +}; + +namespace per_process { +extern struct V8Platform v8_platform; +} + +inline tracing::AgentWriterHandle* GetTracingAgentWriter() { + return per_process::v8_platform.GetTracingAgentWriter(); +} + +inline void DisposePlatform() { + per_process::v8_platform.Dispose(); +} + +} // namespace node + +#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS + +#endif // SRC_NODE_V8_PLATFORM_INL_H_ |