Skip to content

Commit aa252eb

Browse files
ChALkeRTrott
authored andcommitted
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: nodejs#28913 Refs: nodejs#22726 Refs: https://nodejs.org/api/cli.html#cli_trace_sync_io PR-URL: nodejs#28926 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 5eaef7b commit aa252eb

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

src/env-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ inline void Environment::set_printed_error(bool value) {
465465
}
466466

467467
inline void Environment::set_trace_sync_io(bool value) {
468-
options_->trace_sync_io = value;
468+
trace_sync_io_ = value;
469469
}
470470

471471
inline bool Environment::abort_on_uncaught_exception() const {

src/env.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ void Environment::StopProfilerIdleNotifier() {
567567
}
568568

569569
void Environment::PrintSyncTrace() const {
570-
if (!options_->trace_sync_io) return;
570+
if (!trace_sync_io_) return;
571571

572572
HandleScope handle_scope(isolate());
573573

src/env.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,6 +1272,7 @@ class Environment : public MemoryRetainer {
12721272
const uint64_t timer_base_;
12731273
std::shared_ptr<KVStore> env_vars_;
12741274
bool printed_error_ = false;
1275+
bool trace_sync_io_ = false;
12751276
bool emit_env_nonstring_warning_ = true;
12761277
bool emit_err_name_warning_ = true;
12771278
size_t async_callback_scope_depth_ = 0;

src/node_main_instance.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ int NodeMainInstance::Run() {
111111
env->async_hooks()->pop_async_id(1);
112112
}
113113

114+
env->set_trace_sync_io(env->options()->trace_sync_io);
115+
114116
{
115117
SealHandleScope seal(isolate_);
116118
bool more;

0 commit comments

Comments
 (0)