Optimization: use usec in expiration and reuse nNow

(cherry picked from commit bitcoin/bitcoin@c2a4724642)
This commit is contained in:
Pieter Wuille 2016-05-31 20:35:44 +02:00 committed by Jack Grigg
parent 138c768542
commit 53b0d2b1fa
1 changed files with 2 additions and 2 deletions

View File

@ -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) {