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

Some pathfinding cleanups and optimizations:

Browse Source 
* Reduce the log level of an expensive debug message
* Don't hold the request lock while pathfinding
This commit is contained in:
JoelKatz
2016-01-08 11:34:10 -08:00
committed by Nik Bougalis
parent 60ad21ae0d
commit 6dab1657b1
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/ripple/app/paths/PathRequest.cpp
View File

@@ -169,7 +169,6 @@ void PathRequest::updateComplete ()
bool PathRequest::isValid (RippleLineCache::ref crCache) bool PathRequest::isValid (RippleLineCache::ref crCache)
{ {
ScopedLockType sl (mLock);
if (! raSrcAccount || ! raDstAccount) if (! raSrcAccount || ! raDstAccount)
return false; return false;
@@ -246,19 +245,13 @@ PathRequest::doCreate (
RippleLineCache::ref& cache, RippleLineCache::ref& cache,
Json::Value const& value) Json::Value const& value)
{ {
Json::Value status; bool valid = false;
bool valid;
if (parseJson (value) != PFR_PJ_INVALID) if (parseJson (value) != PFR_PJ_INVALID)
{ {
valid = isValid (cache); valid = isValid (cache);
if (! hasCompletion()) if (! hasCompletion() && valid)
status = valid ? doUpdate(cache, true) : jvStatus; doUpdate(cache, true);
}
else
{
valid = false;
status = jvStatus;
} }
if (m_journal.debug) if (m_journal.debug)
@@ -276,7 +269,7 @@ PathRequest::doCreate (
} }
} }
return { valid, std::move(status) }; return { valid, jvStatus };
} }
int PathRequest::parseJson (Json::Value const& jvParams) int PathRequest::parseJson (Json::Value const& jvParams)
@@ -611,28 +604,31 @@ Json::Value PathRequest::doUpdate (RippleLineCache::ref cache, bool fast)
{ {
m_journal.debug << iIdentifier << " update " << (fast ? "fast" : "normal"); m_journal.debug << iIdentifier << " update " << (fast ? "fast" : "normal");
ScopedLockType sl (mLock); {
ScopedLockType sl (mLock);
if (!isValid (cache)) if (!isValid (cache))
return jvStatus; return jvStatus;
jvStatus = Json::objectValue; }
Json::Value newStatus = Json::objectValue;
if (hasCompletion ()) if (hasCompletion ())
{ {
// Old ripple_path_find API gives destination_currencies // Old ripple_path_find API gives destination_currencies
auto& destCurrencies = (jvStatus[jss::destination_currencies] = Json::arrayValue); auto& destCurrencies = (newStatus[jss::destination_currencies] = Json::arrayValue);
auto usCurrencies = accountDestCurrencies (*raDstAccount, cache, true); auto usCurrencies = accountDestCurrencies (*raDstAccount, cache, true);
for (auto const& c : usCurrencies) for (auto const& c : usCurrencies)
destCurrencies.append (to_string (c)); destCurrencies.append (to_string (c));
} }
jvStatus[jss::source_account] = app_.accountIDCache().toBase58(*raSrcAccount); newStatus[jss::source_account] = app_.accountIDCache().toBase58(*raSrcAccount);
jvStatus[jss::destination_account] = app_.accountIDCache().toBase58(*raDstAccount); newStatus[jss::destination_account] = app_.accountIDCache().toBase58(*raDstAccount);
jvStatus[jss::destination_amount] = saDstAmount.getJson (0); newStatus[jss::destination_amount] = saDstAmount.getJson (0);
jvStatus[jss::full_reply] = ! fast; newStatus[jss::full_reply] = ! fast;
if (jvId) if (jvId)
jvStatus["id"] = jvId; newStatus["id"] = jvId;
int iLevel = iLastLevel; int iLevel = iLastLevel;
bool loaded = app_.getFeeTrack().isLoadedLocal(); bool loaded = app_.getFeeTrack().isLoadedLocal();
@@ -670,7 +666,7 @@ Json::Value PathRequest::doUpdate (RippleLineCache::ref cache, bool fast)
m_journal.debug << iIdentifier << " processing at level " << iLevel; m_journal.debug << iIdentifier << " processing at level " << iLevel;
Json::Value jvArray = Json::arrayValue; Json::Value& jvArray = (newStatus[jss::alternatives] = Json::arrayValue);
findPaths(cache, iLevel, jvArray); findPaths(cache, iLevel, jvArray);
bLastSuccess = jvArray.size(); bLastSuccess = jvArray.size();
iLastLevel = iLevel; iLastLevel = iLevel;
@@ -686,8 +682,13 @@ Json::Value PathRequest::doUpdate (RippleLineCache::ref cache, bool fast)
mOwner.reportFull ((ptFullReply-ptCreated).total_milliseconds()); mOwner.reportFull ((ptFullReply-ptCreated).total_milliseconds());
} }
jvStatus[jss::alternatives] = jvArray; {
return jvStatus; ScopedLockType sl (mLock);
jvStatus = newStatus;
}
return newStatus;
} }
InfoSub::pointer PathRequest::getSubscriber () InfoSub::pointer PathRequest::getSubscriber ()

2
src/ripple/app/paths/PathState.cpp
View File

@@ -596,7 +596,7 @@ TER PathState::expandPath (
} }
} }
JLOG (j_.debug) JLOG (j_.trace)
<< "expandPath:" << "expandPath:"
<< " in=" << uMaxCurrencyID << " in=" << uMaxCurrencyID
<< "/" << uMaxIssuerID << "/" << uMaxIssuerID