diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-02 14:25:03 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-02 14:25:09 +0200 |
commit | 42d87749ebeb90c8cf947bac18da3d28160e04c7 (patch) | |
tree | 177d1648b3c3db95228e6fccc3fc9624f4a7b103 /src | |
parent | ead1f65256440b9187086454ad4542f282a684cf (diff) | |
parent | 09a54a65c0d05fe93c4a31603eca8a9a76ff6526 (diff) | |
download | bitcoin-42d87749ebeb90c8cf947bac18da3d28160e04c7.tar.xz |
Merge pull request #4261
09a54a6 Use pnode->nLastRecv as sync score directly (Huang Le)
Diffstat (limited to 'src')
-rw-r--r-- | src/net.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net.cpp b/src/net.cpp index c2dde97040..b0e6699ed2 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1455,13 +1455,13 @@ bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOu // for now, use a very simple selection metric: the node from which we received // most recently -double static NodeSyncScore(const CNode *pnode) { - return -pnode->nLastRecv; +static int64_t NodeSyncScore(const CNode *pnode) { + return pnode->nLastRecv; } void static StartSync(const vector<CNode*> &vNodes) { CNode *pnodeNewSync = NULL; - double dBestScore = 0; + int64_t nBestScore = 0; int nBestHeight = g_signals.GetHeight().get_value_or(0); @@ -1473,10 +1473,10 @@ void static StartSync(const vector<CNode*> &vNodes) { (pnode->nStartingHeight > (nBestHeight - 144)) && (pnode->nVersion < NOBLKS_VERSION_START || pnode->nVersion >= NOBLKS_VERSION_END)) { // if ok, compare node's score with the best so far - double dScore = NodeSyncScore(pnode); - if (pnodeNewSync == NULL || dScore > dBestScore) { + int64_t nScore = NodeSyncScore(pnode); + if (pnodeNewSync == NULL || nScore > nBestScore) { pnodeNewSync = pnode; - dBestScore = dScore; + nBestScore = nScore; } } } |