Optimization: use usec in expiration and reuse nNow

sipa · sipa · commit c2a472464240 · 2016-06-06T02:02:24.000+02:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -5975,15 +5975,15 @@ bool SendMessages(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();
                         }
 
                         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) {

Original file line number	Diff line number	Diff line change
`@@ -5975,15 +5975,15 @@ bool SendMessages(CNode* pto)`
`5975`	`5975`	`nRelayedTransactions++;`
`5976`	`5976`	`{`
`5977`	`5977`	`// Expire old relay messages`
`5978`		`- while (!vRelayExpiration.empty() && vRelayExpiration.front().first < GetTime())`
	`5978`	`+ while (!vRelayExpiration.empty() && vRelayExpiration.front().first < nNow)`
`5979`	`5979`	`{`
`5980`	`5980`	`mapRelay.erase(vRelayExpiration.front().second);`
`5981`	`5981`	`vRelayExpiration.pop_front();`
`5982`	`5982`	`}`
`5983`	`5983`
`5984`	`5984`	`auto ret = mapRelay.insert(std::make_pair(hash, std::move(txinfo.tx)));`
`5985`	`5985`	`if (ret.second) {`
`5986`		`- vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, ret.first));`
	`5986`	`+ vRelayExpiration.push_back(std::make_pair(nNow + 15 * 60 * 1000000, ret.first));`
`5987`	`5987`	`}`
`5988`	`5988`	`}`
`5989`	`5989`	`if (vInv.size() == MAX_INV_SZ) {`