progress: move the "idle" cell to the next cycle ETA column

When all extents within a size tier have been queued, and all the
extents belong to the same file, the queue might take a long time to
fully process.  Also, any progress that is made will be obscured by
the "idle" tag in the "point" column.

Move "idle" to the next cycle ETA column, since the ETA duration will
be zero, and no useful information is lost since we would have "-"
there anyway.

Since the "point" column can now display the maximum value, lower
that maximum to 999999 so that we don't use an extra column.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>

diff --git a/src/bees-roots.cc b/src/bees-roots.cc
index bdca9d70060f63249d7690166fc2499e42c18dd1..22753d0e698b9cc914621ccde7c5ed2d506aacd6 100644 (file)
--- a/src/bees-roots.cc
+++ b/src/bees-roots.cc
@@ -1337,7 +1337,7 @@ BeesScanModeExtent::next_transid()
                const auto &deferred_finished = deferred_map.at(subvol);
                const bool finished = deferred_finished.second;
                if (finished) {
-                       // eta_stamp = "idle";
+                       eta_stamp = "idle";
                } else if (time_so_far > 10 && bytenr_offset > 1024 * 1024 * 1024) {
                        const time_t eta_duration = time_so_far / bytenr_norm;
                        const time_t eta_time = eta_duration + eta_start;
@@ -1347,7 +1347,7 @@ BeesScanModeExtent::next_transid()
                }
                const auto &mma = mes.m_map.at(subvol);
                const auto mma_ratio = mes_sample_size_ok ? (mma.m_bytes / double(mes.m_total)) : 1.0;
-               const auto posn_text = Table::Text(finished ? "idle" : astringprintf("%06d", int(floor(bytenr_norm * 1000000))));
+               const auto posn_text = Table::Text(astringprintf("%06d", int(floor(bytenr_norm * 1000000))));
                const auto size_text = Table::Text( mes_sample_size_ok ? pretty(fs_size * mma_ratio) : "-");
                eta.insert_row(Table::endpos, vector<Table::Content> {
                        Table::Text(magic.m_max_size == numeric_limits<uint64_t>::max() ? "max" : pretty(magic.m_max_size)),