diff --git a/include/dwarfs/console_writer.h b/include/dwarfs/console_writer.h index 384d21a1..ebb69c84 100644 --- a/include/dwarfs/console_writer.h +++ b/include/dwarfs/console_writer.h @@ -29,7 +29,6 @@ #include #include "dwarfs/logger.h" -#include "dwarfs/speedometer.h" namespace dwarfs { @@ -61,7 +60,5 @@ class console_writer : public stream_logger { progress_mode const pg_mode_; get_term_width_type get_term_width_; display_mode const mode_; - bool writing_{false}; - speedometer read_speed_; }; } // namespace dwarfs diff --git a/src/dwarfs/console_writer.cpp b/src/dwarfs/console_writer.cpp index 72f66f70..6910f323 100644 --- a/src/dwarfs/console_writer.cpp +++ b/src/dwarfs/console_writer.cpp @@ -151,8 +151,7 @@ console_writer::console_writer(std::ostream& os, progress_mode pg_mode, , frac_(0.0) , pg_mode_(pg_mode) , get_term_width_(get_term_width) - , mode_(mode) - , read_speed_{std::chrono::seconds(5)} {} + , mode_(mode) {} void console_writer::rewind(int next_rewind_lines) { if (!statebuf_.empty()) { @@ -221,17 +220,6 @@ void console_writer::update(const progress& p, bool last) { switch (mode_) { case NORMAL: - if (writing_) { - read_speed_.put(p.total_bytes_read.load()); - } else { - if (p.total_bytes_read.load() > 0) { - read_speed_.clear(); - writing_ = true; - } else { - read_speed_.put(p.similarity_bytes.load()); - } - } - if (fancy) { oss << terminal_colored(p.status(width.get()), termcolor::BOLD_CYAN, log_is_colored()) @@ -281,10 +269,7 @@ void console_writer::update(const progress& p, bool last) { << newline << "compressed filesystem: " << p.blocks_written << " blocks/" - << size_with_unit(p.compressed_size) << " written, " - << size_with_unit(read_speed_.num_per_second()) << "/s" << newline; - - // TODO: read speed should be somewhere else + << size_with_unit(p.compressed_size) << " written" << newline; break; case REWRITE: