diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-09-06 13:18:52 +0200 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-09-09 14:38:20 +0200 |
| commit | 82787fb04e23d9413460eaad9481be000e378774 (patch) | |
| tree | ce4dad126abfc65e4247f20f27caf5a6335bb1a5 /src | |
| parent | 5977f28ebf1855580a2eef46ec609acc6ef5ca07 (diff) | |
| download | android-node-v8-82787fb04e23d9413460eaad9481be000e378774.tar.gz android-node-v8-82787fb04e23d9413460eaad9481be000e378774.tar.bz2 android-node-v8-82787fb04e23d9413460eaad9481be000e378774.zip | |
src: remove trace_sync_io_ from env
This commit removes trace_sync_io_ and instead uses the options value
directly.
PR-URL: https://github.com/nodejs/node/pull/22726
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/env-inl.h | 2 | ||||
| -rw-r--r-- | src/env.cc | 3 | ||||
| -rw-r--r-- | src/env.h | 1 | ||||
| -rw-r--r-- | src/node.cc | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/src/env-inl.h b/src/env-inl.h index 2e0c4c5d1c..508501909a 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 a12502773a..a2145ab46b 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()); @@ -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 0589608614..f13e33330e 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3052,8 +3052,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; |