Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

The uint32_t key is an implementation detail of the stat class. This adds an overload and externally exposes detail_to_string with a stat::detail parameter and hides the uint32_t key overload. (#3717)

Browse source
This commit is contained in:
clemahieu 2022-02-08 13:24:23 +00:00 • committed by GitHub
commit fefd993989
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nano/lib/stats.cpp
View file

@ -538,9 +538,8 @@ std::string nano::stat::type_to_string (uint32_t key)
return res;
}
std::string nano::stat::detail_to_string (uint32_t key)
std::string nano::stat::detail_to_string (stat::detail detail)
{
auto detail = static_cast<stat::detail> (key >> 8 & 0x000000ff);
std::string res;
switch (detail)
{
@ -893,6 +892,12 @@ std::string nano::stat::detail_to_string (uint32_t key)
return res;
}
std::string nano::stat::detail_to_string (uint32_t key)
{
auto detail = static_cast<stat::detail> (key >> 8 & 0x000000ff);
return detail_to_string (detail);
}
std::string nano::stat::dir_to_string (uint32_t key)
{
auto dir = static_cast<stat::dir> (key & 0x000000ff);

3
nano/lib/stats.hpp
View file

@ -583,7 +583,7 @@ public:
std::unique_ptr<stat_log_sink> log_sink_json () const;
/** Returns string representation of detail */
static std::string detail_to_string (uint32_t key);
static std::string detail_to_string (stat::detail detail);
/** Stop stats being output */
void stop ();
@ -591,6 +591,7 @@ public:
private:
static std::string type_to_string (uint32_t key);
static std::string dir_to_string (uint32_t key);
static std::string detail_to_string (uint32_t key);
/** Constructs a key given type, detail and direction. This is used as input to update(...) and get_entry(...) */
uint32_t key_of (stat::type type, stat::detail detail, stat::dir dir) const

3
nano/node/transport/transport.cpp
View file

@ -128,8 +128,7 @@ void nano::transport::channel::send (nano::message & message_a, std::function<vo
node.stats.inc (nano::stat::type::drop, detail, nano::stat::dir::out);
if (node.config.logging.network_packet_logging ())
{
auto key = static_cast<uint8_t> (detail) << 8;
node.logger.always_log (boost::str (boost::format ("%1% of size %2% dropped") % node.stats.detail_to_string (key) % buffer.size ()));
node.logger.always_log (boost::str (boost::format ("%1% of size %2% dropped") % node.stats.detail_to_string (detail) % buffer.size ()));
}
}
}