ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 22:15:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a rare race condition involving subscribing and unsubscribing.

Browse Source
This commit is contained in:
JoelKatz
2013-03-01 17:01:44 -08:00
parent 4bcc726303
commit d31fa25b95
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -1696,12 +1696,14 @@ bool NetworkOPs::subLedger(InfoSub::ref isrListener, Json::Value& jvResult)
jvResult["reserve_base"] = Json::UInt(lpClosed->getReserve(0)); jvResult["reserve_base"] = Json::UInt(lpClosed->getReserve(0));
jvResult["reserve_inc"] = Json::UInt(lpClosed->getReserveInc()); jvResult["reserve_inc"] = Json::UInt(lpClosed->getReserveInc());
boost::recursive_mutex::scoped_lock sl(mMonitorLock);
return mSubLedger.insert(std::make_pair(isrListener->getSeq(), isrListener)).second; return mSubLedger.insert(std::make_pair(isrListener->getSeq(), isrListener)).second;
} }
// <-- bool: true=erased, false=was not there // <-- bool: true=erased, false=was not there
bool NetworkOPs::unsubLedger(uint64 uSeq) bool NetworkOPs::unsubLedger(uint64 uSeq)
{ {
boost::recursive_mutex::scoped_lock sl(mMonitorLock);
return !!mSubLedger.erase(uSeq); return !!mSubLedger.erase(uSeq);
} }
@@ -1722,36 +1724,42 @@ bool NetworkOPs::subServer(InfoSub::ref isrListener, Json::Value& jvResult)
jvResult["load_base"] = theApp->getFeeTrack().getLoadBase(); jvResult["load_base"] = theApp->getFeeTrack().getLoadBase();
jvResult["load_factor"] = theApp->getFeeTrack().getLoadFactor(); jvResult["load_factor"] = theApp->getFeeTrack().getLoadFactor();
boost::recursive_mutex::scoped_lock sl(mMonitorLock);
return mSubServer.insert(std::make_pair(isrListener->getSeq(), isrListener)).second; return mSubServer.insert(std::make_pair(isrListener->getSeq(), isrListener)).second;
} }
// <-- bool: true=erased, false=was not there // <-- bool: true=erased, false=was not there
bool NetworkOPs::unsubServer(uint64 uSeq) bool NetworkOPs::unsubServer(uint64 uSeq)
{ {
boost::recursive_mutex::scoped_lock sl(mMonitorLock);
return !!mSubServer.erase(uSeq); return !!mSubServer.erase(uSeq);
} }
// <-- bool: true=added, false=already there // <-- bool: true=added, false=already there
bool NetworkOPs::subTransactions(InfoSub::ref isrListener) bool NetworkOPs::subTransactions(InfoSub::ref isrListener)
{ {
boost::recursive_mutex::scoped_lock sl(mMonitorLock);
return mSubTransactions.insert(std::make_pair(isrListener->getSeq(), isrListener)).second; return mSubTransactions.insert(std::make_pair(isrListener->getSeq(), isrListener)).second;
} }
// <-- bool: true=erased, false=was not there // <-- bool: true=erased, false=was not there
bool NetworkOPs::unsubTransactions(uint64 uSeq) bool NetworkOPs::unsubTransactions(uint64 uSeq)
{ {
boost::recursive_mutex::scoped_lock sl(mMonitorLock);
return !!mSubTransactions.erase(uSeq); return !!mSubTransactions.erase(uSeq);
} }
// <-- bool: true=added, false=already there // <-- bool: true=added, false=already there
bool NetworkOPs::subRTTransactions(InfoSub::ref isrListener) bool NetworkOPs::subRTTransactions(InfoSub::ref isrListener)
{ {
boost::recursive_mutex::scoped_lock sl(mMonitorLock);
return mSubTransactions.insert(std::make_pair(isrListener->getSeq(), isrListener)).second; return mSubTransactions.insert(std::make_pair(isrListener->getSeq(), isrListener)).second;
} }
// <-- bool: true=erased, false=was not there // <-- bool: true=erased, false=was not there
bool NetworkOPs::unsubRTTransactions(uint64 uSeq) bool NetworkOPs::unsubRTTransactions(uint64 uSeq)
{ {
boost::recursive_mutex::scoped_lock sl(mMonitorLock);
return !!mSubTransactions.erase(uSeq); return !!mSubTransactions.erase(uSeq);
} }