progress-bar: re-draw last update if nothing new for 1sec.

dtzWill · dtzWill · commit 44de71a39624 · 2018-06-18T17:54:09.000-05:00
Slightly nicer behavior when updates are somewhat far apart
(during a long linking step, perhaps) ensuring things
don't appear unresponsive.

If we wait the maximum amount for the update,
don't bother waiting another 50ms (for rate-limiting purposes)
and just check if we should quit.

This also ensures we'll notice the request to quit within 1s
if quit is signalled but there is not an udpate.
(I'm not sure if this happens or not)
diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc
@@ -75,9 +75,10 @@ class ProgressBar : public Logger
         updateThread = std::thread([&]() {
             auto state(state_.lock());
             while (state->active) {
-                state.wait(updateCV);
+                auto r = state.wait_for(updateCV, std::chrono::seconds(1));
                 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));
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,10 @@ class ProgressBar : public Logger`
`75`	`75`	`updateThread = std::thread([&]() {`
`76`	`76`	`auto state(state_.lock());`
`77`	`77`	`while (state->active) {`
`78`		`- state.wait(updateCV);`
	`78`	`+ auto r = state.wait_for(updateCV, std::chrono::seconds(1));`
`79`	`79`	`draw(*state);`
`80`		`- state.wait_for(quitCV, std::chrono::milliseconds(50));`
	`80`	`+ if (r == std::cv_status::no_timeout)`
	`81`	`+ state.wait_for(quitCV, std::chrono::milliseconds(50));`
`81`	`82`	`}`
`82`	`83`	`});`
`83`	`84`	`}`