diff options
| author | fanquake <fanquake@gmail.com> | 2022-06-28 18:18:06 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-06-28 18:18:19 +0100 |
| commit | 2364d17a31e8ae838ff32327f55cbe84b0e70b34 (patch) | |
| tree | 7a8efaf98803e81ccce08eb0b6f279aec49eade8 /src | |
| parent | bace615ba31cedec50afa4f296934a186b9afae6 (diff) | |
| parent | fa956e7508986991008e2f6126ab307924b3f353 (diff) | |
| download | bitcoin-2364d17a31e8ae838ff32327f55cbe84b0e70b34.tar.xz | |
Merge bitcoin/bitcoin#25480: Replace CountSecondsDouble with Ticks<SecondsDouble>
fa956e7508986991008e2f6126ab307924b3f353 Replace CountSecondsDouble with Ticks<SecondsDouble> (MacroFake)
Pull request description:
Seems odd to have two ways to say exactly the same thing when one is sufficient.
ACKs for top commit:
fanquake:
ACK fa956e7508986991008e2f6126ab307924b3f353
shaavan:
ACK fa956e7508986991008e2f6126ab307924b3f353
w0xlt:
ACK https://github.com/bitcoin/bitcoin/pull/25480/commits/fa956e7508986991008e2f6126ab307924b3f353
Tree-SHA512: b599470e19b693da1ed1102d1e86b08cb03adaddf2048752b6d050fdf86055be117ff0ae10b6953d03e00eaaf7b0cfa350137968b67d6c5b3ca68c5aa50ca6aa
Diffstat (limited to 'src')
| -rw-r--r-- | src/net_processing.cpp | 2 | ||||
| -rw-r--r-- | src/rpc/net.cpp | 6 | ||||
| -rw-r--r-- | src/util/time.h | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index a556180721..9b87833391 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -3019,7 +3019,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type, if (peer->m_addr_token_bucket < MAX_ADDR_PROCESSING_TOKEN_BUCKET) { // Don't increment bucket if it's already full const auto time_diff = std::max(current_time - peer->m_addr_token_timestamp, 0us); - const double increment = CountSecondsDouble(time_diff) * MAX_ADDR_RATE_PER_SECOND; + const double increment = Ticks<SecondsDouble>(time_diff) * MAX_ADDR_RATE_PER_SECOND; peer->m_addr_token_bucket = std::min<double>(peer->m_addr_token_bucket + increment, MAX_ADDR_PROCESSING_TOKEN_BUCKET); } peer->m_addr_token_timestamp = current_time; diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 0a061f2451..fad92629c5 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -206,13 +206,13 @@ static RPCHelpMan getpeerinfo() obj.pushKV("conntime", count_seconds(stats.m_connected)); obj.pushKV("timeoffset", stats.nTimeOffset); if (stats.m_last_ping_time > 0us) { - obj.pushKV("pingtime", CountSecondsDouble(stats.m_last_ping_time)); + obj.pushKV("pingtime", Ticks<SecondsDouble>(stats.m_last_ping_time)); } if (stats.m_min_ping_time < std::chrono::microseconds::max()) { - obj.pushKV("minping", CountSecondsDouble(stats.m_min_ping_time)); + obj.pushKV("minping", Ticks<SecondsDouble>(stats.m_min_ping_time)); } if (fStateStats && statestats.m_ping_wait > 0s) { - obj.pushKV("pingwait", CountSecondsDouble(statestats.m_ping_wait)); + obj.pushKV("pingwait", Ticks<SecondsDouble>(statestats.m_ping_wait)); } obj.pushKV("version", stats.nVersion); // Use the sanitized form of subver here, to avoid tricksy remote peers from diff --git a/src/util/time.h b/src/util/time.h index 1a381aab9d..0f87d66c2e 100644 --- a/src/util/time.h +++ b/src/util/time.h @@ -57,11 +57,6 @@ constexpr int64_t count_microseconds(std::chrono::microseconds t) { return t.cou using SecondsDouble = std::chrono::duration<double, std::chrono::seconds::period>; /** - * Helper to count the seconds in any std::chrono::duration type - */ -inline double CountSecondsDouble(SecondsDouble t) { return t.count(); } - -/** * DEPRECATED * Use either ClockType::now() or Now<TimePointType>() if a cast is needed. * ClockType is |