neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Switch RequestGovernanceObjectVotes from pointers to hashes (#2189)

Browse Source 
* No need for pointers to gobjects, can simply use hashes in RequestGovernanceObjectVotes

* Drop `swap` and `=` in GovernanceObject

Were used for shuffling, no longer needed
This commit is contained in:
UdjinM6 2018-07-25 18:09:30 +03:00 committed by GitHub
parent eb202e812f
commit a5643f899d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/governance-object.cpp
View File

@ -735,30 +735,6 @@ void CGovernanceObject::UpdateSentinelVariables()
if(GetAbsoluteNoCount(VOTE_SIGNAL_VALID) >= nAbsVoteReq) fCachedValid = false; if(GetAbsoluteNoCount(VOTE_SIGNAL_VALID) >= nAbsVoteReq) fCachedValid = false;
} }
void CGovernanceObject::swap(CGovernanceObject& first, CGovernanceObject& second) // nothrow
{
// enable ADL (not necessary in our case, but good practice)
using std::swap;
// by swapping the members of two classes,
// the two classes are effectively swapped
swap(first.nHashParent, second.nHashParent);
swap(first.nRevision, second.nRevision);
swap(first.nTime, second.nTime);
swap(first.nDeletionTime, second.nDeletionTime);
swap(first.nCollateralHash, second.nCollateralHash);
swap(first.vchData, second.vchData);
swap(first.nObjectType, second.nObjectType);
// swap all cached valid flags
swap(first.fCachedFunding, second.fCachedFunding);
swap(first.fCachedValid, second.fCachedValid);
swap(first.fCachedDelete, second.fCachedDelete);
swap(first.fCachedEndorsed, second.fCachedEndorsed);
swap(first.fDirtyCache, second.fDirtyCache);
swap(first.fExpired, second.fExpired);
}
void CGovernanceObject::CheckOrphanVotes(CConnman& connman) void CGovernanceObject::CheckOrphanVotes(CConnman& connman)
{ {
int64_t nNow = GetAdjustedTime(); int64_t nNow = GetAdjustedTime();

8
src/governance-object.h
View File

@ -194,8 +194,6 @@ public:
CGovernanceObject(const CGovernanceObject& other); CGovernanceObject(const CGovernanceObject& other);
void swap(CGovernanceObject& first, CGovernanceObject& second); // nothrow
// Public Getter methods // Public Getter methods
int64_t GetCreationTime() const { int64_t GetCreationTime() const {
@ -355,12 +353,6 @@ public:
// AFTER DESERIALIZATION OCCURS, CACHED VARIABLES MUST BE CALCULATED MANUALLY // AFTER DESERIALIZATION OCCURS, CACHED VARIABLES MUST BE CALCULATED MANUALLY
} }
CGovernanceObject& operator=(CGovernanceObject from)
{
swap(*this, from);
return *this;
}
private: private:
// FUNCTIONS FOR DEALING WITH DATA STRING // FUNCTIONS FOR DEALING WITH DATA STRING
void LoadData(); void LoadData();

40
src/governance.cpp
View File

@ -1065,8 +1065,8 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
int nTimeout = 60 * 60; int nTimeout = 60 * 60;
size_t nPeersPerHashMax = 3; size_t nPeersPerHashMax = 3;
std::vector<CGovernanceObject*> vpGovObjsTmp; std::vector<uint256> vTriggerObjHashes;
std::vector<CGovernanceObject*> vpGovObjsTriggersTmp; std::vector<uint256> vOtherObjHashes;
// This should help us to get some idea about an impact this can bring once deployed on mainnet. // This should help us to get some idea about an impact this can bring once deployed on mainnet.
// Testnet is ~40 times smaller in masternode count, but only ~1000 masternodes usually vote, // Testnet is ~40 times smaller in masternode count, but only ~1000 masternodes usually vote,
@ -1098,32 +1098,30 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
if(mapAskedRecently[nHash].size() >= nPeersPerHashMax) continue; if(mapAskedRecently[nHash].size() >= nPeersPerHashMax) continue;
} }
auto govObj = objPair.second; if(objPair.second.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
if(govObj.nObjectType == GOVERNANCE_OBJECT_TRIGGER) { vTriggerObjHashes.push_back(nHash);
vpGovObjsTriggersTmp.push_back(&govObj);
} else { } else {
vpGovObjsTmp.push_back(&govObj); vOtherObjHashes.push_back(nHash);
} }
} }
} }
LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- start: vpGovObjsTriggersTmp %d vpGovObjsTmp %d mapAskedRecently %d\n", LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- start: vTriggerObjHashes %d vOtherObjHashes %d mapAskedRecently %d\n",
vpGovObjsTriggersTmp.size(), vpGovObjsTmp.size(), mapAskedRecently.size()); vTriggerObjHashes.size(), vOtherObjHashes.size(), mapAskedRecently.size());
FastRandomContext insecure_rand; FastRandomContext insecure_rand;
// shuffle pointers std::random_shuffle(vTriggerObjHashes.begin(), vTriggerObjHashes.end(), insecure_rand);
std::random_shuffle(vpGovObjsTriggersTmp.begin(), vpGovObjsTriggersTmp.end(), insecure_rand); std::random_shuffle(vOtherObjHashes.begin(), vOtherObjHashes.end(), insecure_rand);
std::random_shuffle(vpGovObjsTmp.begin(), vpGovObjsTmp.end(), insecure_rand);
for (int i = 0; i < nMaxObjRequestsPerNode; ++i) { for (int i = 0; i < nMaxObjRequestsPerNode; ++i) {
uint256 nHashGovobj; uint256 nHashGovobj;
// ask for triggers first // ask for triggers first
if(vpGovObjsTriggersTmp.size()) { if(vTriggerObjHashes.size()) {
nHashGovobj = vpGovObjsTriggersTmp.back()->GetHash(); nHashGovobj = vTriggerObjHashes.back();
} else { } else {
if(vpGovObjsTmp.empty()) break; if(vOtherObjHashes.empty()) break;
nHashGovobj = vpGovObjsTmp.back()->GetHash(); nHashGovobj = vOtherObjHashes.back();
} }
bool fAsked = false; bool fAsked = false;
for (const auto& pnode : vNodesCopy) { for (const auto& pnode : vNodesCopy) {
@ -1147,17 +1145,17 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
if(mapAskedRecently[nHashGovobj].size() >= nPeersPerHashMax) break; if(mapAskedRecently[nHashGovobj].size() >= nPeersPerHashMax) break;
} }
// NOTE: this should match `if` above (the one before `while`) // NOTE: this should match `if` above (the one before `while`)
if(vpGovObjsTriggersTmp.size()) { if(vTriggerObjHashes.size()) {
vpGovObjsTriggersTmp.pop_back(); vTriggerObjHashes.pop_back();
} else { } else {
vpGovObjsTmp.pop_back(); vOtherObjHashes.pop_back();
} }
if(!fAsked) i--; if(!fAsked) i--;
} }
LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- end: vpGovObjsTriggersTmp %d vpGovObjsTmp %d mapAskedRecently %d\n", LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- end: vTriggerObjHashes %d vOtherObjHashes %d mapAskedRecently %d\n",
vpGovObjsTriggersTmp.size(), vpGovObjsTmp.size(), mapAskedRecently.size()); vTriggerObjHashes.size(), vOtherObjHashes.size(), mapAskedRecently.size());
return int(vpGovObjsTriggersTmp.size() + vpGovObjsTmp.size()); return int(vTriggerObjHashes.size() + vOtherObjHashes.size());
} }
bool CGovernanceManager::AcceptObjectMessage(const uint256& nHash) bool CGovernanceManager::AcceptObjectMessage(const uint256& nHash)