GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 21:35:45 +02:00
Code Packages

progress: squeeze the progress table into 80 columns or less

Browse Source 
We don't need the subvol numbers since they're only interesting to
developers.

We don't need both max and min sizes, pick one and drop the other.

Replace "16E" with "max"--it is the same number of characters, but
doesn't require the user to know what 1<<64 is off the top of their head.

Shorten "remain" to "todo" because sometimes those extra two columns
matter.

Drop the seconds field in ETA timestamps.  Long scan arrival times are
years away, and short scan arrival times are only updated once every
5 minutes, so the extra precision isn't useful.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell 2024-11-29 01:51:33 -05:00
parent 9c183c2c22
commit c1af219246
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bees-roots.cc
View File

@ -1038,7 +1038,9 @@ BeesScanModeExtent::next_transid(const CrawlMap &crawl_map_unused)
const auto time_so_far = now - min(now, this_state.m_started); const auto time_so_far = now - min(now, this_state.m_started);
string eta_stamp = "-"; string eta_stamp = "-";
string eta_pretty = "-"; string eta_pretty = "-";
const bool finished = deferred_map.at(subvol).second; const auto &deferred_finished = deferred_map.at(subvol);
const bool deferred = deferred_finished.first;
const bool finished = deferred_finished.second;
if (time_so_far > 1 && bytenr_percent > 0 && !finished) { if (time_so_far > 1 && bytenr_percent > 0 && !finished) {
const time_t eta_duration = time_so_far / (bytenr_percent / 100); const time_t eta_duration = time_so_far / (bytenr_percent / 100);
const time_t eta_time = eta_duration + now; const time_t eta_time = eta_duration + now;
@ -1046,22 +1048,21 @@ BeesScanModeExtent::next_transid(const CrawlMap &crawl_map_unused)
DIE_IF_ZERO(localtime_r(&eta_time, &ltm)); DIE_IF_ZERO(localtime_r(&eta_time, &ltm));
char buf[1024] = { 0 }; char buf[1024] = { 0 };
DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm)); DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", &ltm));
eta_stamp = string(buf); eta_stamp = string(buf);
eta_pretty = pretty_seconds(eta_duration); eta_pretty = pretty_seconds(eta_duration);
} }
const auto &mma = mes.m_map.at(subvol); 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 mma_ratio = mes_sample_size_ok ? (mma.m_bytes / double(mes.m_total)) : 1.0;
const auto pos_text = Table::Text(deferred_map.at(subvol).first ? "deferred" : pretty(bytenr_offset * mma_ratio)); const auto pos_scaled_text = mes_sample_size_ok ? pretty(bytenr_offset * mma_ratio) : "-";
const auto pos_text = Table::Text(deferred ? "deferred" : pos_scaled_text);
const auto pct_text = Table::Text(finished ? "finished" : astringprintf("%.4f%%", bytenr_percent)); const auto pct_text = Table::Text(finished ? "finished" : astringprintf("%.4f%%", bytenr_percent));
const auto size_text = Table::Text( mes_sample_size_ok ? pretty(fs_size * mma_ratio) : "-"); const auto size_text = Table::Text( mes_sample_size_ok ? pretty(fs_size * mma_ratio) : "-");
eta.insert_row(Table::endpos, vector<Table::Content> { eta.insert_row(Table::endpos, vector<Table::Content> {
pos_text, pos_text,
size_text, size_text,
pct_text, pct_text,
Table::Number(subvol), Table::Text(magic.m_max_size == numeric_limits<uint64_t>::max() ? "max" : pretty(magic.m_max_size)),
Table::Text(pretty(magic.m_min_size & ~BLOCK_MASK_CLONE)),
Table::Text(pretty(magic.m_max_size)),
Table::Number(this_state.m_min_transid), Table::Number(this_state.m_min_transid),
Table::Number(this_state.m_max_transid), Table::Number(this_state.m_max_transid),
Table::Text(eta_pretty), Table::Text(eta_pretty),
@ -1073,12 +1074,10 @@ BeesScanModeExtent::next_transid(const CrawlMap &crawl_map_unused)
Table::Text("done"), Table::Text("done"),
Table::Text(pretty(fs_size)), Table::Text(pretty(fs_size)),
Table::Text("%done"), Table::Text("%done"),
Table::Text("sub"), Table::Text("size"),
Table::Text("szmn"),
Table::Text("szmx"),
Table::Text("transid"), Table::Text("transid"),
Table::Number(m_roots->transid_max()), Table::Number(m_roots->transid_max()),
Table::Text("remain"), Table::Text("todo"),
Table::Text("ETA"), Table::Text("ETA"),
}); });
const auto dash_fill = Table::Fill('-'); const auto dash_fill = Table::Fill('-');