TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-10 04:50:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: race for statebuf_ in simple progress mode

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-12-22 22:54:43 +01:00
parent 9adf183117
commit 1590abbac3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dwarfs/console_writer.cpp
View File

@ -307,14 +307,13 @@ void console_writer::update(progress& p, bool last) {
std::string tmp = std::string tmp =
fmt::format(" ==> {0:.0f}% done, {1} blocks/{2} written", 100 * frac_, fmt::format(" ==> {0:.0f}% done, {1} blocks/{2} written", 100 * frac_,
p.blocks_written.load(), size_with_unit(p.compressed_size)); p.blocks_written.load(), size_with_unit(p.compressed_size));
std::lock_guard lock(log_mutex());
if (tmp != statebuf_) { if (tmp != statebuf_) {
auto t = get_current_time_string(); auto t = get_current_time_string();
statebuf_ = tmp; statebuf_ = tmp;
std::lock_guard lock(log_mutex());
log_stream() << "- " << t << statebuf_ << "\n"; log_stream() << "- " << t << statebuf_ << "\n";
} }
if (last) { if (last) {
std::lock_guard lock(log_mutex());
log_stream() << oss.str(); log_stream() << oss.str();
} }
} else { } else {