From b20aab7c15a15aff712d4359936106ac3f92d083 Mon Sep 17 00:00:00 2001 From: cryptocode Date: Wed, 25 Sep 2019 21:33:52 +0200 Subject: [PATCH] Classify traffic stats correctly (#2309) --- nano/lib/stats.cpp | 6 +++--- nano/lib/stats.hpp | 2 +- nano/node/transport/udp.cpp | 4 ++-- nano/qt/qt.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nano/lib/stats.cpp b/nano/lib/stats.cpp index bce4e409..fba556b4 100644 --- a/nano/lib/stats.cpp +++ b/nano/lib/stats.cpp @@ -415,11 +415,11 @@ std::string nano::stat::type_to_string (uint32_t key) case nano::stat::type::rollback: res = "rollback"; break; - case nano::stat::type::traffic: - res = "traffic"; + case nano::stat::type::traffic_udp: + res = "traffic_udp"; break; case nano::stat::type::traffic_tcp: - res = "traffic_bootstrap"; + res = "traffic_tcp"; break; case nano::stat::type::vote: res = "vote"; diff --git a/nano/lib/stats.hpp b/nano/lib/stats.hpp index 223f1c20..a9b5662f 100644 --- a/nano/lib/stats.hpp +++ b/nano/lib/stats.hpp @@ -220,7 +220,7 @@ public: /** Primary statistics type */ enum class type : uint8_t { - traffic, + traffic_udp, traffic_tcp, error, message, diff --git a/nano/node/transport/udp.cpp b/nano/node/transport/udp.cpp index b21deacd..f6712bb8 100644 --- a/nano/node/transport/udp.cpp +++ b/nano/node/transport/udp.cpp @@ -48,7 +48,7 @@ std::function nano::transport:: } if (size_a > 0) { - node_l->stats.add (nano::stat::type::traffic, nano::stat::dir::out, size_a); + node_l->stats.add (nano::stat::type::traffic_udp, nano::stat::dir::out, size_a); } if (callback_a) @@ -544,7 +544,7 @@ void nano::transport::udp_channels::receive_action (nano::message_buffer * data_ } else { - node.stats.add (nano::stat::type::traffic, nano::stat::dir::in, data_a->size); + node.stats.add (nano::stat::type::traffic_udp, nano::stat::dir::in, data_a->size); } } else diff --git a/nano/qt/qt.cpp b/nano/qt/qt.cpp index 0bd64530..193d1322 100644 --- a/nano/qt/qt.cpp +++ b/nano/qt/qt.cpp @@ -829,7 +829,7 @@ void nano_qt::stats_viewer::refresh_stats () detail = "total"; } - if (type == "traffic" || type == "traffic_bootstrap") + if (type == "traffic_udp" || type == "traffic_tcp") { const std::vector units = { " bytes", " KB", " MB", " GB", " TB", " PB" }; double bytes = std::stod (value);