Commit 4a747f6
Revert "src: remove trace_sync_io_ from env"
This reverts commit 7fa5f54.
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: #28913
Refs: #22726
Refs: https://nodejs.org/api/cli.html#cli_trace_sync_io
PR-URL: #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>1 parent bdd442f commit 4a747f6
4 files changed
Lines changed: 5 additions & 2 deletions
| 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 | |
|---|---|---|---|
@@ -1250,6 +1250,7 @@ class Environment : public MemoryRetainer { | |||
| 1250 | 1250 | const uint64_t timer_base_; | |
| 1251 | 1251 | std::shared_ptr<KVStore> env_vars_; | |
| 1252 | 1252 | bool printed_error_ = false; | |
| 1253 | + bool trace_sync_io_ = false; | ||
| 1253 | 1254 | bool emit_env_nonstring_warning_ = true; | |
| 1254 | 1255 | bool emit_err_name_warning_ = true; | |
| 1255 | 1256 | size_t async_callback_scope_depth_ = 0; | |
| 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; | |
0 commit comments