diff options
author | Anna Henningsen <anna@addaleax.net> | 2018-10-20 11:02:37 +0200 |
---|---|---|
committer | Matheus Marchini <mat@mmarchini.me> | 2018-10-24 11:18:47 -0300 |
commit | 036fbdb63d603a64bd8562ec9331dfb7a5c5075c (patch) | |
tree | 074fd39f0951479bb0daac154c4a9e291b917804 /src/env.cc | |
parent | d568b53931958075be962ce79d23c24307af66f5 (diff) | |
download | android-node-v8-036fbdb63d603a64bd8562ec9331dfb7a5c5075c.tar.gz android-node-v8-036fbdb63d603a64bd8562ec9331dfb7a5c5075c.tar.bz2 android-node-v8-036fbdb63d603a64bd8562ec9331dfb7a5c5075c.zip |
src: remove `Environment::tracing_agent_writer()`
As per the conversation in https://github.com/nodejs/node/issues/22513,
this is essentially global, and adding this on the Environment
is generally just confusing.
Refs: https://github.com/nodejs/node/issues/22513
Fixes: https://github.com/nodejs/node/issues/22767
PR-URL: https://github.com/nodejs/node/pull/23781
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Matheus Marchini <mat@mmarchini.me>
Diffstat (limited to 'src/env.cc')
-rw-r--r-- | src/env.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/env.cc b/src/env.cc index 9d8fd967a4..5da673b3e0 100644 --- a/src/env.cc +++ b/src/env.cc @@ -143,11 +143,9 @@ void Environment::TrackingTraceStateObserver::UpdateTraceCategoryState() { } Environment::Environment(IsolateData* isolate_data, - Local<Context> context, - tracing::AgentWriterHandle* tracing_agent_writer) + Local<Context> context) : isolate_(context->GetIsolate()), isolate_data_(isolate_data), - tracing_agent_writer_(tracing_agent_writer), immediate_info_(context->GetIsolate()), tick_info_(context->GetIsolate()), timer_base_(uv_now(isolate_data->event_loop())), @@ -183,10 +181,9 @@ Environment::Environment(IsolateData* isolate_data, AssignToContext(context, ContextInfo("")); - if (tracing_agent_writer_ != nullptr) { + if (tracing::AgentWriterHandle* writer = GetTracingAgentWriter()) { trace_state_observer_.reset(new TrackingTraceStateObserver(this)); - v8::TracingController* tracing_controller = - tracing_agent_writer_->GetTracingController(); + v8::TracingController* tracing_controller = writer->GetTracingController(); if (tracing_controller != nullptr) tracing_controller->AddTraceStateObserver(trace_state_observer_.get()); } @@ -235,9 +232,10 @@ Environment::~Environment() { context()->SetAlignedPointerInEmbedderData( ContextEmbedderIndex::kEnvironment, nullptr); - if (tracing_agent_writer_ != nullptr) { - v8::TracingController* tracing_controller = - tracing_agent_writer_->GetTracingController(); + if (trace_state_observer_) { + tracing::AgentWriterHandle* writer = GetTracingAgentWriter(); + CHECK_NOT_NULL(writer); + v8::TracingController* tracing_controller = writer->GetTracingController(); if (tracing_controller != nullptr) tracing_controller->RemoveTraceStateObserver(trace_state_observer_.get()); } |