sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix deadlocks on cs_vSend in RequestGovernanceObject (#1387)

Browse Source
This commit is contained in:
Tim Flynn 2017-03-08 17:36:40 -05:00 committed by UdjinM6
parent c8b6199979
commit eb4e6a32dd
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/governance.cpp
View File

@ -1036,6 +1036,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
filter.clear(); filter.clear();
if(fUseFilter) { if(fUseFilter) {
LOCK(cs);
CGovernanceObject* pObj = FindGovernanceObject(nHash); CGovernanceObject* pObj = FindGovernanceObject(nHash);
if(pObj) { if(pObj) {
@ -1064,14 +1065,13 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
if(vNodesCopy.empty()) return -1; if(vNodesCopy.empty()) return -1;
LOCK2(cs_main, cs);
if(mapObjects.empty()) return -2;
int64_t nNow = GetTime(); int64_t nNow = GetTime();
int nTimeout = 60 * 60; int nTimeout = 60 * 60;
size_t nPeersPerHashMax = 3; size_t nPeersPerHashMax = 3;
std::vector<CGovernanceObject*> vpGovObjsTmp;
std::vector<CGovernanceObject*> vpGovObjsTriggersTmp;
// 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,
// so 1 obj on mainnet == ~10 objs or ~1000 votes on testnet. However we want to test a higher // so 1 obj on mainnet == ~10 objs or ~1000 votes on testnet. However we want to test a higher
@ -1083,25 +1083,28 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
nMaxObjRequestsPerNode = std::max(1, int(nProjectedVotes / std::max(1, mnodeman.size()))); nMaxObjRequestsPerNode = std::max(1, int(nProjectedVotes / std::max(1, mnodeman.size())));
} }
std::vector<CGovernanceObject*> vpGovObjsTmp; {
std::vector<CGovernanceObject*> vpGovObjsTriggersTmp; LOCK2(cs_main, cs);
for(object_m_it it = mapObjects.begin(); it != mapObjects.end(); ++it) { if(mapObjects.empty()) return -2;
if(mapAskedRecently.count(it->first)) {
std::map<CService, int64_t>::iterator it1 = mapAskedRecently[it->first].begin(); for(object_m_it it = mapObjects.begin(); it != mapObjects.end(); ++it) {
while(it1 != mapAskedRecently[it->first].end()) { if(mapAskedRecently.count(it->first)) {
if(it1->second < nNow) { std::map<CService, int64_t>::iterator it1 = mapAskedRecently[it->first].begin();
mapAskedRecently[it->first].erase(it1++); while(it1 != mapAskedRecently[it->first].end()) {
} else { if(it1->second < nNow) {
++it1; mapAskedRecently[it->first].erase(it1++);
} else {
++it1;
}
} }
if(mapAskedRecently[it->first].size() >= nPeersPerHashMax) continue;
}
if(it->second.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
vpGovObjsTriggersTmp.push_back(&(it->second));
} else {
vpGovObjsTmp.push_back(&(it->second));
} }
if(mapAskedRecently[it->first].size() >= nPeersPerHashMax) continue;
}
if(it->second.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
vpGovObjsTriggersTmp.push_back(&(it->second));
} else {
vpGovObjsTmp.push_back(&(it->second));
} }
} }
@ -1301,24 +1304,28 @@ void CGovernanceManager::RequestOrphanObjects()
{ {
std::vector<CNode*> vNodesCopy = CopyNodeVector(); std::vector<CNode*> vNodesCopy = CopyNodeVector();
std::vector<uint256> vecHashesFiltered;
{ {
LOCK(cs);
std::vector<uint256> vecHashes; std::vector<uint256> vecHashes;
LOCK(cs);
mapOrphanVotes.GetKeys(vecHashes); mapOrphanVotes.GetKeys(vecHashes);
LogPrint("gobject", "CGovernanceObject::RequestOrphanObjects -- number objects = %d\n", vecHashes.size());
for(size_t i = 0; i < vecHashes.size(); ++i) { for(size_t i = 0; i < vecHashes.size(); ++i) {
const uint256& nHash = vecHashes[i]; const uint256& nHash = vecHashes[i];
if(mapObjects.find(nHash) != mapObjects.end()) { if(mapObjects.find(nHash) == mapObjects.end()) {
vecHashesFiltered.push_back(nHash);
}
}
}
LogPrint("gobject", "CGovernanceObject::RequestOrphanObjects -- number objects = %d\n", vecHashesFiltered.size());
for(size_t i = 0; i < vecHashesFiltered.size(); ++i) {
const uint256& nHash = vecHashesFiltered[i];
for(size_t j = 0; j < vNodesCopy.size(); ++j) {
CNode* pnode = vNodesCopy[j];
if(pnode->fMasternode) {
continue; continue;
} }
for(size_t j = 0; j < vNodesCopy.size(); ++j) { RequestGovernanceObject(pnode, nHash);
CNode* pnode = vNodesCopy[j];
if(pnode->fMasternode) {
continue;
}
RequestGovernanceObject(pnode, nHash);
}
} }
} }