mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2241 from dtzWill/feature/refresh-progress-bar

Browse source 
progress-bar: refresh occasionally even if no updates are received
This commit is contained in:
Eelco Dolstra 2018-06-19 09:13:58 +02:00 committed by GitHub
commit 629398d05c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/sync.hh
View file

@ -57,11 +57,11 @@ public:
} }
template<class Rep, class Period> template<class Rep, class Period>
void wait_for(std::condition_variable & cv, std::cv_status wait_for(std::condition_variable & cv,
const std::chrono::duration<Rep, Period> & duration) const std::chrono::duration<Rep, Period> & duration)
{ {
assert(s); assert(s);
cv.wait_for(lk, duration); return cv.wait_for(lk, duration);
} }
template<class Rep, class Period, class Predicate> template<class Rep, class Period, class Predicate>

5
src/nix/progress-bar.cc
View file

@ -75,9 +75,10 @@ public:
updateThread = std::thread([&]() { updateThread = std::thread([&]() {
auto state(state_.lock()); auto state(state_.lock());
while (state->active) { while (state->active) {
state.wait(updateCV); auto r = state.wait_for(updateCV, std::chrono::seconds(1));
draw(*state); draw(*state);
state.wait_for(quitCV, std::chrono::milliseconds(50)); if (r == std::cv_status::no_timeout)
state.wait_for(quitCV, std::chrono::milliseconds(50));
} }
}); });
} }