src: remove trace_sync_io_ from env

danbev · danbev · commit 82787fb04e23 · 2018-09-09T14:38:20.000+02:00
This commit removes trace_sync_io_ and instead uses the options value directly. PR-URL: nodejs#22726 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
diff --git 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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ inline void Environment::set_printed_error(bool value) {`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`inline void Environment::set_trace_sync_io(bool value) {`
`419`		`- trace_sync_io_ = value;`
	`419`	`+ options_->trace_sync_io = value;`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`inline bool Environment::abort_on_uncaught_exception() const {`
Original file line number	Diff line number	Diff line change
`@@ -3052,8 +3052,6 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data,`
`3052`	`3052`	`env.async_hooks()->pop_async_id(1);`
`3053`	`3053`	`}`
`3054`	`3054`
`3055`		`- env.set_trace_sync_io(env.options()->trace_sync_io);`
`3056`		`-`
`3057`	`3055`	`{`
`3058`	`3056`	`SealHandleScope seal(isolate);`
`3059`	`3057`	`bool more;`