forked from lix-project/lix
libmain/progress-bar: do not start the update thread when not on a TTY
The progress bar normally maintains the invariant that the update thread is
only running when the progress bar is active. This was violated when it is
already created in inactive state, which happens when stderr is not a TTY. The
update thread is superfluous and would cause std::terminate if the logger were
to be destroyed.
Change-Id: I6ed3e26cdba00e5ac316078fea272d3a1aa0d112
This commit is contained in:
parent
206a5dbb8f
commit
75284a5263
|
@ -44,17 +44,20 @@ static std::string_view storePathToName(std::string_view path)
|
|||
ProgressBar::ProgressBar(bool isTTY)
|
||||
: isTTY(isTTY)
|
||||
{
|
||||
state_.lock()->active = isTTY;
|
||||
updateThread = std::thread([&]() {
|
||||
auto state(state_.lock());
|
||||
auto nextWakeup = A_LONG_TIME;
|
||||
while (state->active) {
|
||||
if (!state->haveUpdate)
|
||||
state.wait_for(updateCV, nextWakeup);
|
||||
nextWakeup = draw(*state, {});
|
||||
state.wait_for(quitCV, std::chrono::milliseconds(50));
|
||||
}
|
||||
});
|
||||
if ((state_.lock()->active = isTTY)) {
|
||||
// Only start the update thread when the logger is set to active.
|
||||
// Otherwise, the destructor will std::terminate trying to destroy a joinable thread.
|
||||
updateThread = std::thread([&]() {
|
||||
auto state(state_.lock());
|
||||
auto nextWakeup = A_LONG_TIME;
|
||||
while (state->active) {
|
||||
if (!state->haveUpdate)
|
||||
state.wait_for(updateCV, nextWakeup);
|
||||
nextWakeup = draw(*state, {});
|
||||
state.wait_for(quitCV, std::chrono::milliseconds(50));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ProgressBar::~ProgressBar()
|
||||
|
|
Loading…
Reference in a new issue