Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Alexander Blair 2020-08-16 12:47:36 -07:00
parent 236256f114 afd002c31f
commit 0b0da2aa81
No known key found for this signature in database
GPG Key ID: C64552D877C32479
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/util.cpp
View File

@ -1116,7 +1116,7 @@ std::string get_nix_version_display_string()
static constexpr const byte_map sizes[] = static constexpr const byte_map sizes[] =
{ {
{"%.0f B", 1024}, {"%.0f B", 1024},
{"%.2f KB", 1024 * 1024}, {"%.2f kB", 1024 * 1024},
{"%.2f MB", std::uint64_t(1024) * 1024 * 1024}, {"%.2f MB", std::uint64_t(1024) * 1024 * 1024},
{"%.2f GB", std::uint64_t(1024) * 1024 * 1024 * 1024}, {"%.2f GB", std::uint64_t(1024) * 1024 * 1024 * 1024},
{"%.2f TB", std::uint64_t(1024) * 1024 * 1024 * 1024 * 1024} {"%.2f TB", std::uint64_t(1024) * 1024 * 1024 * 1024 * 1024}

6
src/daemon/rpc_command_executor.cpp
View File

@ -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 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 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; 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 % net_stats_res.total_bytes_in
% tools::get_human_readable_bytes(net_stats_res.total_bytes_in) % tools::get_human_readable_bytes(net_stats_res.total_bytes_in)
% net_stats_res.total_packets_in % net_stats_res.total_packets_in
% tools::get_human_readable_timespan(seconds)
% tools::get_human_readable_bytes(average) % tools::get_human_readable_bytes(average)
% percent % percent
% tools::get_human_readable_bytes(limit); % 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; average = seconds > 0 ? net_stats_res.total_bytes_out / seconds : 0;
limit = limit_res.limit_up * 1024; limit = limit_res.limit_up * 1024;
percent = (double)average / (double)limit * 100.0; 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 % net_stats_res.total_bytes_out
% tools::get_human_readable_bytes(net_stats_res.total_bytes_out) % tools::get_human_readable_bytes(net_stats_res.total_bytes_out)
% net_stats_res.total_packets_out % net_stats_res.total_packets_out
% tools::get_human_readable_timespan(seconds)
% tools::get_human_readable_bytes(average) % tools::get_human_readable_bytes(average)
% percent % percent
% tools::get_human_readable_bytes(limit); % tools::get_human_readable_bytes(limit);