|
|
|
@ -107,9 +107,15 @@ void CAddrMan::SwapRandom(int nRndPos1, int nRndPos2)
@@ -107,9 +107,15 @@ void CAddrMan::SwapRandom(int nRndPos1, int nRndPos2)
|
|
|
|
|
if (nRndPos1 == nRndPos2) |
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
assert(nRndPos1 >= 0 && nRndPos2 >= 0); |
|
|
|
|
assert(nRndPos1 < vRandom.size() && nRndPos2 < vRandom.size()); |
|
|
|
|
|
|
|
|
|
int nId1 = vRandom[nRndPos1]; |
|
|
|
|
int nId2 = vRandom[nRndPos2]; |
|
|
|
|
|
|
|
|
|
assert(mapInfo.count(nId1) == 1); |
|
|
|
|
assert(mapInfo.count(nId2) == 1); |
|
|
|
|
|
|
|
|
|
mapInfo[nId1].nRandomPos = nRndPos2; |
|
|
|
|
mapInfo[nId2].nRandomPos = nRndPos1; |
|
|
|
|
|
|
|
|
@ -124,26 +130,32 @@ int CAddrMan::SelectTried(int nKBucket)
@@ -124,26 +130,32 @@ int CAddrMan::SelectTried(int nKBucket)
|
|
|
|
|
// random shuffle the first few elements (using the entire list)
|
|
|
|
|
// find the least recently tried among them
|
|
|
|
|
int64 nOldest = -1; |
|
|
|
|
int nOldestPos = -1; |
|
|
|
|
for (unsigned int i = 0; i < ADDRMAN_TRIED_ENTRIES_INSPECT_ON_EVICT && i < vTried.size(); i++) |
|
|
|
|
{ |
|
|
|
|
int nPos = GetRandInt(vTried.size() - i) + i; |
|
|
|
|
int nTemp = vTried[nPos]; |
|
|
|
|
vTried[nPos] = vTried[i]; |
|
|
|
|
vTried[i] = nTemp; |
|
|
|
|
if (nOldest == -1 || mapInfo[nTemp].nLastSuccess < mapInfo[nOldest].nLastSuccess) |
|
|
|
|
assert(nOldest == -1 || mapInfo.count(nTemp) == 1); |
|
|
|
|
if (nOldest == -1 || mapInfo[nTemp].nLastSuccess < mapInfo[nOldest].nLastSuccess) { |
|
|
|
|
nOldest = nTemp; |
|
|
|
|
nOldestPos = nPos; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return nOldest; |
|
|
|
|
return nOldestPos; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
int CAddrMan::ShrinkNew(int nUBucket) |
|
|
|
|
{ |
|
|
|
|
assert(nUBucket >= 0 && nUBucket < vvNew.size()); |
|
|
|
|
std::set<int> &vNew = vvNew[nUBucket]; |
|
|
|
|
|
|
|
|
|
// first look for deletable items
|
|
|
|
|
for (std::set<int>::iterator it = vNew.begin(); it != vNew.end(); it++) |
|
|
|
|
{ |
|
|
|
|
assert(mapInfo.count(*it)); |
|
|
|
|
CAddrInfo &info = mapInfo[*it]; |
|
|
|
|
if (info.IsTerrible()) |
|
|
|
|
{ |
|
|
|
@ -168,11 +180,13 @@ int CAddrMan::ShrinkNew(int nUBucket)
@@ -168,11 +180,13 @@ int CAddrMan::ShrinkNew(int nUBucket)
|
|
|
|
|
{ |
|
|
|
|
if (nI == n[0] || nI == n[1] || nI == n[2] || nI == n[3]) |
|
|
|
|
{ |
|
|
|
|
assert(nOldest == -1 || mapInfo.count(*it) == 1); |
|
|
|
|
if (nOldest == -1 || mapInfo[*it].nTime < mapInfo[nOldest].nTime) |
|
|
|
|
nOldest = *it; |
|
|
|
|
} |
|
|
|
|
nI++; |
|
|
|
|
} |
|
|
|
|
assert(mapInfo.count(nOldest) == 1); |
|
|
|
|
CAddrInfo &info = mapInfo[nOldest]; |
|
|
|
|
if (--info.nRefCount == 0) |
|
|
|
|
{ |
|
|
|
@ -189,6 +203,8 @@ int CAddrMan::ShrinkNew(int nUBucket)
@@ -189,6 +203,8 @@ int CAddrMan::ShrinkNew(int nUBucket)
|
|
|
|
|
|
|
|
|
|
void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin) |
|
|
|
|
{ |
|
|
|
|
assert(vvNew[nOrigin].count(nId) == 1); |
|
|
|
|
|
|
|
|
|
// remove the entry from all new buckets
|
|
|
|
|
for (std::vector<std::set<int> >::iterator it = vvNew.begin(); it != vvNew.end(); it++) |
|
|
|
|
{ |
|
|
|
@ -197,6 +213,8 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin)
@@ -197,6 +213,8 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin)
|
|
|
|
|
} |
|
|
|
|
nNew--; |
|
|
|
|
|
|
|
|
|
assert(info.nRefCount == 0); |
|
|
|
|
|
|
|
|
|
// what tried bucket to move the entry to
|
|
|
|
|
int nKBucket = info.GetTriedBucket(nKey); |
|
|
|
|
std::vector<int> &vTried = vvTried[nKBucket]; |
|
|
|
@ -214,6 +232,7 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin)
@@ -214,6 +232,7 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin)
|
|
|
|
|
int nPos = SelectTried(nKBucket); |
|
|
|
|
|
|
|
|
|
// find which new bucket it belongs to
|
|
|
|
|
assert(mapInfo.count(vTried[nPos]) == 1); |
|
|
|
|
int nUBucket = mapInfo[vTried[nPos]].GetNewBucket(nKey); |
|
|
|
|
std::set<int> &vNew = vvNew[nUBucket]; |
|
|
|
|
|
|
|
|
@ -385,6 +404,7 @@ CAddress CAddrMan::Select_(int nUnkBias)
@@ -385,6 +404,7 @@ CAddress CAddrMan::Select_(int nUnkBias)
|
|
|
|
|
std::vector<int> &vTried = vvTried[nKBucket]; |
|
|
|
|
if (vTried.size() == 0) continue; |
|
|
|
|
int nPos = GetRandInt(vTried.size()); |
|
|
|
|
assert(mapInfo.count(vTried[nPos]) == 1); |
|
|
|
|
CAddrInfo &info = mapInfo[vTried[nPos]]; |
|
|
|
|
if (GetRandInt(1<<30) < fChanceFactor*info.GetChance()*(1<<30)) |
|
|
|
|
return info; |
|
|
|
@ -402,6 +422,7 @@ CAddress CAddrMan::Select_(int nUnkBias)
@@ -402,6 +422,7 @@ CAddress CAddrMan::Select_(int nUnkBias)
|
|
|
|
|
std::set<int>::iterator it = vNew.begin(); |
|
|
|
|
while (nPos--) |
|
|
|
|
it++; |
|
|
|
|
assert(mapInfo.count(*it) == 1); |
|
|
|
|
CAddrInfo &info = mapInfo[*it]; |
|
|
|
|
if (GetRandInt(1<<30) < fChanceFactor*info.GetChance()*(1<<30)) |
|
|
|
|
return info; |
|
|
|
@ -481,6 +502,7 @@ void CAddrMan::GetAddr_(std::vector<CAddress> &vAddr)
@@ -481,6 +502,7 @@ void CAddrMan::GetAddr_(std::vector<CAddress> &vAddr)
|
|
|
|
|
{ |
|
|
|
|
int nRndPos = GetRandInt(vRandom.size() - n) + n; |
|
|
|
|
SwapRandom(n, nRndPos); |
|
|
|
|
assert(mapInfo.count(vRandom[n]) == 1); |
|
|
|
|
vAddr.push_back(mapInfo[vRandom[n]]); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|