From 9e64e9cf452c3e129160da0f28260811192ce5c6 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 6 Sep 2018 13:18:52 +0200 Subject: [PATCH] src: remove trace_sync_io_ from env This commit removes trace_sync_io_ and instead uses the options value directly. --- src/env-inl.h | 2 +- src/env.cc | 3 +-- src/env.h | 1 - src/node.cc | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/env-inl.h b/src/env-inl.h index 28c30e035438c5..6d3e858e9869d3 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -416,7 +416,7 @@ inline void Environment::set_printed_error(bool value) { } inline void Environment::set_trace_sync_io(bool value) { - trace_sync_io_ = value; + options_->trace_sync_io = value; } inline bool Environment::abort_on_uncaught_exception() const { diff --git a/src/env.cc b/src/env.cc index 8fe6711632389a..9de4a3c9b22553 100644 --- a/src/env.cc +++ b/src/env.cc @@ -132,7 +132,6 @@ Environment::Environment(IsolateData* isolate_data, tick_info_(context->GetIsolate()), timer_base_(uv_now(isolate_data->event_loop())), printed_error_(false), - trace_sync_io_(false), abort_on_uncaught_exception_(false), emit_env_nonstring_warning_(true), makecallback_cntr_(0), @@ -351,7 +350,7 @@ void Environment::StopProfilerIdleNotifier() { } void Environment::PrintSyncTrace() const { - if (!trace_sync_io_) + if (!options_->trace_sync_io) return; HandleScope handle_scope(isolate()); diff --git a/src/env.h b/src/env.h index fa802e4016dfdb..df5619450148f2 100644 --- a/src/env.h +++ b/src/env.h @@ -913,7 +913,6 @@ class Environment { TickInfo tick_info_; const uint64_t timer_base_; bool printed_error_; - bool trace_sync_io_; bool abort_on_uncaught_exception_; bool emit_env_nonstring_warning_; size_t makecallback_cntr_; diff --git a/src/node.cc b/src/node.cc index d1ce0ce1af3870..dc06436bb941dc 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3051,8 +3051,6 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, env.async_hooks()->pop_async_id(1); } - env.set_trace_sync_io(env.options()->trace_sync_io); - { SealHandleScope seal(isolate); bool more;