ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework dispatch of new API PF requests.

Browse Source
This commit is contained in:
JoelKatz
2013-05-03 09:33:58 -07:00
parent 0e9973d3a8
commit 9e47107255
5 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/cpp/ripple/PFRequest.cpp
View File

@@ -12,7 +12,7 @@ boost::recursive_mutex PFRequest::sLock;
std::set<PFRequest::wptr> PFRequest::sRequests;
PFRequest::PFRequest(const boost::shared_ptr<InfoSub>& subscriber) :
wpSubscriber(subscriber), jvStatus(Json::objectValue), bValid(false)
wpSubscriber(subscriber), jvStatus(Json::objectValue), bValid(false), bNew(true)
{
;
}
@@ -23,6 +23,12 @@ bool PFRequest::isValid()
return bValid;
}
bool PFRequest::isNew()
{
boost::recursive_mutex::scoped_lock sl(mLock);
return bNew;
}
bool PFRequest::isValid(Ledger::ref lrLedger)
{
boost::recursive_mutex::scoped_lock sl(mLock);
@@ -198,6 +204,8 @@ bool PFRequest::doUpdate(RLCache::ref cache, bool fast)
jvStatus = Json::objectValue;
if (!isValid(cache->getLedger()))
return false;
if (!fast)
bNew = false;
std::set<currIssuer_t> sourceCurrencies(sciSourceCurrencies);
if (sourceCurrencies.empty())
@@ -248,11 +256,10 @@ bool PFRequest::doUpdate(RLCache::ref cache, bool fast)
return true;
}
void PFRequest::updateAll(const boost::shared_ptr<Ledger>& ledger)
void PFRequest::updateAll(Ledger::ref ledger, bool newOnly)
{
assert(ledger->isImmutable());
std::set<wptr> requests;
{
boost::recursive_mutex::scoped_lock sl(sLock);
requests = sRequests;
@@ -267,7 +274,7 @@ void PFRequest::updateAll(const boost::shared_ptr<Ledger>& ledger)
{
bool remove = true;
PFRequest::pointer pRequest = wRequest.lock();
if (pRequest)
if (pRequest && (!newOnly || pRequest->isNew()))
{
InfoSub::pointer ipSub = pRequest->wpSubscriber.lock();
if (ipSub)
@@ -275,7 +282,7 @@ void PFRequest::updateAll(const boost::shared_ptr<Ledger>& ledger)
Json::Value update;
{
boost::recursive_mutex::scoped_lock sl(pRequest->mLock);
pRequest->doUpdate(cache, true);
pRequest->doUpdate(cache, false);
update = pRequest->jvStatus;
}
update["type"] = "path_find";