NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

fix: Avoid deadlock in ProgressBar::redraw()

Browse source
This commit is contained in:
Robert Hensing 2024-09-08 11:44:24 +02:00
parent e10ea78f93
commit c955563b64
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,11 +75,11 @@ private:
bool active = true;
bool paused = false;
bool haveUpdate = true;
/** Helps avoid unnecessary redraws, see `draw()` */
std::string lastOutput;
};
/** Helps avoid unnecessary redraws, see `redraw()` */
Sync<std::string> lastOutput_;
Sync<State> state_;
std::thread updateThread;
@ -371,10 +371,10 @@ public:
*/
void redraw(std::string newOutput)
{
auto state(state_.lock());
if (newOutput != state->lastOutput) {
auto lastOutput(lastOutput_.lock());
if (newOutput != *lastOutput) {
writeToStderr(newOutput);
state->lastOutput = std::move(newOutput);
*lastOutput = std::move(newOutput);
}
}