From 6aea75e12b40cd02b795c88f2c189e50fac3dd49 Mon Sep 17 00:00:00 2001 From: Wesley Shillingford Date: Thu, 12 Mar 2020 14:02:52 +0000 Subject: [PATCH] Include requesting telemetry metrics from temporary channels (#2653) * Include requesting telemetry metrics from temporary channels * Read transaction no longer needed (Gui comment) --- nano/node/election.hpp | 2 +- nano/node/json_handler.cpp | 3 +-- nano/node/telemetry.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nano/node/election.hpp b/nano/node/election.hpp index 5d51a9cb..4d21435f 100644 --- a/nano/node/election.hpp +++ b/nano/node/election.hpp @@ -51,7 +51,7 @@ private: // State management static int constexpr confirmed_duration_factor = 5; std::atomic state_m = { state_t::idle }; - // Protects state_start, last_vote and last_block + // These time points must be protected by this mutex std::mutex timepoints_mutex; std::chrono::steady_clock::time_point state_start = { std::chrono::steady_clock::now () }; std::chrono::steady_clock::time_point last_block = { std::chrono::steady_clock::now () }; diff --git a/nano/node/json_handler.cpp b/nano/node/json_handler.cpp index 0a34ee25..ea11063f 100644 --- a/nano/node/json_handler.cpp +++ b/nano/node/json_handler.cpp @@ -1226,8 +1226,7 @@ void nano::json_handler::block_account () void nano::json_handler::block_count () { - auto transaction (node.store.tx_begin_read ()); - response_l.put ("count", std::to_string (node.store.block_count (transaction).sum ())); + response_l.put ("count", std::to_string (node.ledger.cache.block_count)); response_l.put ("unchecked", std::to_string (node.ledger.cache.unchecked_count)); response_l.put ("cemented", std::to_string (node.ledger.cache.cemented_count)); response_errors (); diff --git a/nano/node/telemetry.cpp b/nano/node/telemetry.cpp index bb30a9a2..aa599b76 100644 --- a/nano/node/telemetry.cpp +++ b/nano/node/telemetry.cpp @@ -111,7 +111,7 @@ void nano::telemetry::ongoing_req_all_peers (std::chrono::milliseconds next_requ peers; { - auto temp_peers = this_l->network.list (std::numeric_limits::max (), this_l->network_params.protocol.telemetry_protocol_version_min, false); + auto temp_peers = this_l->network.list (std::numeric_limits::max (), this_l->network_params.protocol.telemetry_protocol_version_min); peers.insert (temp_peers.begin (), temp_peers.end ()); }