Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 17:09:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed deadlock caused by locking the mutex in p3Identity after the one in p3GxsReputation

Browse Source
This commit is contained in:
csoler 2017-01-28 15:26:12 +01:00
parent f90ebb1dfc
commit 7327f1a98b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libretroshare/src/services/p3gxsreputation.cc
View File

@ -451,23 +451,24 @@ void p3GxsReputation::cleanup()
++it ; ++it ;
} }
// update opinions based on flags and contact information // Update opinions based on flags and contact information.
// Note: the call to rsIdentity->isARegularContact() is done off-mutex, in order to avoid a cross-deadlock, as
// normally, p3GxsReputation gets called by p3dentity and not te reverse. That explains the weird implementation
// of these two loops.
{ {
std::list<RsGxsId> should_set_to_positive ; std::list<RsGxsId> should_set_to_positive_candidates ;
if(mAutoSetPositiveOptionToContacts)
{ {
RsStackMutex stack(mReputationMtx); /****** LOCKED MUTEX *******/ RsStackMutex stack(mReputationMtx); /****** LOCKED MUTEX *******/
for(std::map<RsGxsId,Reputation>::iterator it(mReputations.begin());it!=mReputations.end();++it) for(std::map<RsGxsId,Reputation>::iterator it(mReputations.begin());it!=mReputations.end();++it)
{ if(it->second.mOwnOpinion == RsReputations::OPINION_NEUTRAL)
bool is_a_contact = rsIdentity->isARegularContact(it->first) ; should_set_to_positive_candidates.push_back(it->first) ;
if(mAutoSetPositiveOptionToContacts && is_a_contact && it->second.mOwnOpinion == RsReputations::OPINION_NEUTRAL)
should_set_to_positive.push_back(it->first) ;
}
} }
for(std::list<RsGxsId>::const_iterator it(should_set_to_positive.begin());it!=should_set_to_positive.end();++it) for(std::list<RsGxsId>::const_iterator it(should_set_to_positive_candidates.begin());it!=should_set_to_positive_candidates.end();++it)
if(rsIdentity->isARegularContact(*it))
setOwnOpinion(*it,RsReputations::OPINION_POSITIVE) ; setOwnOpinion(*it,RsReputations::OPINION_POSITIVE) ;
} }
} }