diff options
author | Alois Wohlschlager <alois1@gmx-topmail.de> | 2024-06-29 15:03:44 +0200 |
---|---|---|
committer | Alois Wohlschlager <alois1@gmx-topmail.de> | 2024-07-01 18:19:34 +0200 |
commit | 0dd1d8ca1cdccfc620644a7f690ed35bcd2d1e74 (patch) | |
tree | f2cd3d4fa62e7956879d57cc041e6fe62836b36d /src/nix/eval.cc | |
parent | a55112898e23df10a7a0d2a0cd359996100e3512 (diff) |
tree-wide: unify progress bar inactive and paused states
Previously, the progress bar had two subtly different states in which the bar
would not actually render, both with their own shortcomings: inactive (which
was irreversible) and paused (reversible, but swallowing logs). Furthermore,
there was no way of resetting the statistics, so a very bad solution was
implemented (243c0f18dae2a08ea0e46f7ff33277c63f7506d7) that would create a new
logger for each line of the repl, leaking the previous one and discarding the
value of printBuildLogs. Finally, if stderr was not attached to a TTY, the
update thread was started even though the logger was not active, violating the
invariant required by the destructor (which is not observed because the logger
is leaked).
In this commit, the two aforementioned states are unified into a single one,
which can be exited again, correctly upholds the invariant that the update
thread is only running while the progress bar is active, and does not swallow
logs. The latter change in behavior is not expected to be a problems in the
rare cases where the paused state was used before, since other loggers (like
the simple one) don't exhibit it anyway. The startProgressBar/stopProgressBar
API is removed due to being a footgun, and a new method for properly resetting
the progress is added.
Co-Authored-By: Qyriad <qyriad@qyriad.me>
Change-Id: I2b7c3eb17d439cd0c16f7b896cfb61239ac7ff3a
Diffstat (limited to 'src/nix/eval.cc')
-rw-r--r-- | src/nix/eval.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nix/eval.cc b/src/nix/eval.cc index 9f265930b..a027b9a58 100644 --- a/src/nix/eval.cc +++ b/src/nix/eval.cc @@ -6,7 +6,6 @@ #include "eval.hh" #include "eval-inline.hh" #include "value-to-json.hh" -#include "progress-bar.hh" #include <nlohmann/json.hpp> @@ -76,7 +75,7 @@ struct CmdEval : MixJSON, InstallableCommand, MixReadOnlyOption } if (writeTo) { - stopProgressBar(); + logger->pause(); if (pathExists(*writeTo)) throw Error("path '%s' already exists", *writeTo); @@ -114,7 +113,7 @@ struct CmdEval : MixJSON, InstallableCommand, MixReadOnlyOption } else if (raw) { - stopProgressBar(); + logger->pause(); writeFull(STDOUT_FILENO, *state->coerceToString(noPos, *v, context, "while generating the eval command output")); } |