lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge "progress-bar.cc: fix signed overflow" into main

Browse source
This commit is contained in:
jade 2024-03-28 15:21:11 +00:00 committed by Gerrit Code Review
parent 80405d0626 ffbad9b762
commit ae065a992d
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libmain/progress-bar.cc
View file

@ -12,6 +12,8 @@
namespace nix { namespace nix {
using namespace std::literals::chrono_literals;
static std::string_view getS(const std::vector<Logger::Field> & fields, size_t n) static std::string_view getS(const std::vector<Logger::Field> & fields, size_t n)
{ {
assert(n < fields.size()); assert(n < fields.size());
@ -33,6 +35,9 @@ static std::string_view storePathToName(std::string_view path)
return i == std::string::npos ? base.substr(0, 0) : base.substr(i + 1); return i == std::string::npos ? base.substr(0, 0) : base.substr(i + 1);
} }
// 100 years ought to be enough for anyone (yet sufficiently smaller than max() to not cause signed integer overflow).
constexpr const auto A_LONG_TIME = std::chrono::duration_cast<std::chrono::milliseconds>(100 * 365 * 86400s);
class ProgressBar : public Logger class ProgressBar : public Logger
{ {
private: private:
@ -93,7 +98,7 @@ public:
state_.lock()->active = isTTY; state_.lock()->active = isTTY;
updateThread = std::thread([&]() { updateThread = std::thread([&]() {
auto state(state_.lock()); auto state(state_.lock());
auto nextWakeup = std::chrono::milliseconds::max(); auto nextWakeup = A_LONG_TIME;
while (state->active) { while (state->active) {
if (!state->haveUpdate) if (!state->haveUpdate)
state.wait_for(updateCV, nextWakeup); state.wait_for(updateCV, nextWakeup);
@ -350,7 +355,7 @@ public:
std::chrono::milliseconds draw(State & state) std::chrono::milliseconds draw(State & state)
{ {
auto nextWakeup = std::chrono::milliseconds::max(); auto nextWakeup = A_LONG_TIME;
state.haveUpdate = false; state.haveUpdate = false;
if (state.paused || !state.active) return nextWakeup; if (state.paused || !state.active) return nextWakeup;