Merge pull request #6689
afd002c31
daemon: print sampling time in print_net_stats (moneromooo-monero)ec7bba079
util: fix kilo prefix typo (K instead of k) (moneromooo-monero)
This commit is contained in:
commit
0b0da2aa81
@ -1116,7 +1116,7 @@ std::string get_nix_version_display_string()
|
||||
static constexpr const byte_map sizes[] =
|
||||
{
|
||||
{"%.0f B", 1024},
|
||||
{"%.2f KB", 1024 * 1024},
|
||||
{"%.2f kB", 1024 * 1024},
|
||||
{"%.2f MB", std::uint64_t(1024) * 1024 * 1024},
|
||||
{"%.2f GB", std::uint64_t(1024) * 1024 * 1024 * 1024},
|
||||
{"%.2f TB", std::uint64_t(1024) * 1024 * 1024 * 1024 * 1024}
|
||||
|
@ -721,10 +721,11 @@ bool t_rpc_command_executor::print_net_stats()
|
||||
uint64_t average = seconds > 0 ? net_stats_res.total_bytes_in / seconds : 0;
|
||||
uint64_t limit = limit_res.limit_down * 1024; // convert to bytes, as limits are always kB/s
|
||||
double percent = (double)average / (double)limit * 100.0;
|
||||
tools::success_msg_writer() << boost::format("Received %u bytes (%s) in %u packets, average %s/s = %.2f%% of the limit of %s/s")
|
||||
tools::success_msg_writer() << boost::format("Received %u bytes (%s) in %u packets in %s, average %s/s = %.2f%% of the limit of %s/s")
|
||||
% net_stats_res.total_bytes_in
|
||||
% tools::get_human_readable_bytes(net_stats_res.total_bytes_in)
|
||||
% net_stats_res.total_packets_in
|
||||
% tools::get_human_readable_timespan(seconds)
|
||||
% tools::get_human_readable_bytes(average)
|
||||
% percent
|
||||
% tools::get_human_readable_bytes(limit);
|
||||
@ -732,10 +733,11 @@ bool t_rpc_command_executor::print_net_stats()
|
||||
average = seconds > 0 ? net_stats_res.total_bytes_out / seconds : 0;
|
||||
limit = limit_res.limit_up * 1024;
|
||||
percent = (double)average / (double)limit * 100.0;
|
||||
tools::success_msg_writer() << boost::format("Sent %u bytes (%s) in %u packets, average %s/s = %.2f%% of the limit of %s/s")
|
||||
tools::success_msg_writer() << boost::format("Sent %u bytes (%s) in %u packets in %s, average %s/s = %.2f%% of the limit of %s/s")
|
||||
% net_stats_res.total_bytes_out
|
||||
% tools::get_human_readable_bytes(net_stats_res.total_bytes_out)
|
||||
% net_stats_res.total_packets_out
|
||||
% tools::get_human_readable_timespan(seconds)
|
||||
% tools::get_human_readable_bytes(average)
|
||||
% percent
|
||||
% tools::get_human_readable_bytes(limit);
|
||||
|
Loading…
Reference in New Issue
Block a user