mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-07 14:12:43 -04:00
* Fix Deadlock in GXS Test Backend ... double Mutex lock for ALL Msgs removed.
* Disable periodic print out of bandwidth control. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5340 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
2e4cc099dc
commit
ef3ae10c63
2 changed files with 1 additions and 3 deletions
|
@ -165,7 +165,7 @@ bool p3BandwidthControl::checkAvailableBandwidth()
|
||||||
rateMap.erase(it);
|
rateMap.erase(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
printRateInfo_locked(std::cerr);
|
//printRateInfo_locked(std::cerr);
|
||||||
|
|
||||||
/* any left over rateMaps ... are bad! (or not active - more likely) */
|
/* any left over rateMaps ... are bad! (or not active - more likely) */
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -827,8 +827,6 @@ bool GxsDataProxy::getMsgRelatedList(uint32_t &token, const RsTokReqOptions &opt
|
||||||
}
|
}
|
||||||
else if (onlyAllVersions)
|
else if (onlyAllVersions)
|
||||||
{
|
{
|
||||||
RsStackMutex stack(mDataMtx); /***** LOCKED *****/
|
|
||||||
|
|
||||||
for(mit = mMsgMetaData.begin(); mit != mMsgMetaData.end(); mit++)
|
for(mit = mMsgMetaData.begin(); mit != mMsgMetaData.end(); mit++)
|
||||||
{
|
{
|
||||||
if (mit->second.mOrigMsgId == origMsgId)
|
if (mit->second.mOrigMsgId == origMsgId)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue