From: Gavin Andresen <gavinandresen@gmail.com>
Date: Wed, 5 Oct 2011 14:22:52 +0000 (-0700)
Subject: Merge pull request #561 from luke-jr/optimize_conn_adjtime
X-Git-Tag: v0.4.0-unstable~226^2~109
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=9ec4fa7b50e6389cab5792acd4210397c77f9f44;hp=3552497ae52b78f799be3d34d7a874d610ee6e71;p=novacoin.git

Merge pull request #561 from luke-jr/optimize_conn_adjtime

Only GetAdjustedTime once for the retry loop
---

diff --git a/src/net.cpp b/src/net.cpp
index 1792bf7..b106913 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1438,6 +1438,8 @@ void ThreadOpenConnections2(void* parg)
             BOOST_FOREACH(CNode* pnode, vNodes)
                 setConnected.insert(pnode->addr.ip & 0x0000ffff);
 
+        int64 nANow = GetAdjustedTime();
+
         CRITICAL_BLOCK(cs_mapAddresses)
         {
             BOOST_FOREACH(const PAIRTYPE(vector<unsigned char>, CAddress)& item, mapAddresses)
@@ -1445,8 +1447,8 @@ void ThreadOpenConnections2(void* parg)
                 const CAddress& addr = item.second;
                 if (!addr.IsIPv4() || !addr.IsValid() || setConnected.count(addr.ip & 0x0000ffff))
                     continue;
-                int64 nSinceLastSeen = GetAdjustedTime() - addr.nTime;
-                int64 nSinceLastTry = GetAdjustedTime() - addr.nLastTry;
+                int64 nSinceLastSeen = nANow - addr.nTime;
+                int64 nSinceLastTry = nANow - addr.nLastTry;
 
                 // Randomize the order in a deterministic way, putting the standard port first
                 int64 nRandomizer = (uint64)(nStart * 4951 + addr.nLastTry * 9567851 + addr.ip * 7789) % (2 * 60 * 60);