From 53b0d2b1fa6769efdd3cdfe7c3e5d170611fe5e3 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Tue, 31 May 2016 20:35:44 +0200 Subject: [PATCH] Optimization: use usec in expiration and reuse nNow (cherry picked from commit bitcoin/bitcoin@c2a4724642400bc9200aeef4c725b5c07eee9d90) --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c9c9896e7..7506668de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7509,7 +7509,7 @@ bool SendMessages(const Consensus::Params& params, CNode* pto) nRelayedTransactions++; { // Expire old relay messages - while (!vRelayExpiration.empty() && vRelayExpiration.front().first < GetTime()) + while (!vRelayExpiration.empty() && vRelayExpiration.front().first < nNow) { mapRelay.erase(vRelayExpiration.front().second); vRelayExpiration.pop_front(); @@ -7517,7 +7517,7 @@ bool SendMessages(const Consensus::Params& params, CNode* pto) auto ret = mapRelay.insert(std::make_pair(hash, std::move(txinfo.tx))); if (ret.second) { - vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, ret.first)); + vRelayExpiration.push_back(std::make_pair(nNow + 15 * 60 * 1000000, ret.first)); } } if (vInv.size() == MAX_INV_SZ) {