Revert "src: remove trace_sync_io_ from env"

ChALkeR · Trott · commit aa252ebf66c4 · 2019-08-03T20:41:50.000-07:00
This reverts commit 7fa5f54e6f2854183e45e0e105a1e22a381aac60. The reverted commit breaks the logic behind --trace-sync-io, it should be enabled only at a certain point in time, while that commit enables it from the very start, causing warnings be printed for all sync io instead of sync io after the first tick of the event loop as documented. Fixes: nodejs/node#28913 Refs: nodejs/node#22726 Refs: https://nodejs.org/api/cli.html#cli_trace_sync_io PR-URL: nodejs/node#28926 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -465,7 +465,7 @@ inline void Environment::set_printed_error(bool value) {
 }
 
 inline void Environment::set_trace_sync_io(bool value) {
-  options_->trace_sync_io = value;
+  trace_sync_io_ = value;
 }
 
 inline bool Environment::abort_on_uncaught_exception() const {
diff --git a/src/env.cc b/src/env.cc
@@ -567,7 +567,7 @@ void Environment::StopProfilerIdleNotifier() {
 }
 
 void Environment::PrintSyncTrace() const {
-  if (!options_->trace_sync_io) return;
+  if (!trace_sync_io_) return;
 
   HandleScope handle_scope(isolate());
 
diff --git a/src/env.h b/src/env.h
@@ -1272,6 +1272,7 @@ class Environment : public MemoryRetainer {
   const uint64_t timer_base_;
   std::shared_ptr<KVStore> env_vars_;
   bool printed_error_ = false;
+  bool trace_sync_io_ = false;
   bool emit_env_nonstring_warning_ = true;
   bool emit_err_name_warning_ = true;
   size_t async_callback_scope_depth_ = 0;
diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc
@@ -111,6 +111,8 @@ int NodeMainInstance::Run() {
       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
`@@ -465,7 +465,7 @@ inline void Environment::set_printed_error(bool value) {`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`inline void Environment::set_trace_sync_io(bool value) {`
`468`		`- options_->trace_sync_io = value;`
	`468`	`+ trace_sync_io_ = value;`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`inline bool Environment::abort_on_uncaught_exception() const {`
Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,7 @@ void Environment::StopProfilerIdleNotifier() {`
`567`	`567`	`}`
`568`	`568`
`569`	`569`	`void Environment::PrintSyncTrace() const {`
`570`		`- if (!options_->trace_sync_io) return;`
	`570`	`+ if (!trace_sync_io_) return;`
`571`	`571`
`572`	`572`	`HandleScope handle_scope(isolate());`
`573`	`573`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ int NodeMainInstance::Run() {`
`111`	`111`	`env->async_hooks()->pop_async_id(1);`
`112`	`112`	`}`
`113`	`113`
	`114`	`+ env->set_trace_sync_io(env->options()->trace_sync_io);`
	`115`	`+`
`114`	`116`	`{`
`115`	`117`	`SealHandleScope seal(isolate_);`
`116`	`118`	`bool more;`