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

calcNodeAdvance fix.

Browse Source
This commit is contained in:
David Schwartz
2013-09-24 14:38:48 -07:00
parent c76e2b54a9
commit 8b0df758f3
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ripple_app/paths/PathState.h
View File

@@ -55,6 +55,7 @@ public:
uint256 uDirectTip; // Current directory.
uint256 uDirectEnd; // Next order book.
bool bDirectAdvance; // Need to advance directory.
bool bDirectRestart; // Need to restart directory.
SLE::pointer sleDirectDir;
STAmount saOfrRate; // For correct ratio.

20
src/ripple_app/paths/RippleCalc.cpp
View File

@@ -34,6 +34,7 @@ TER RippleCalc::calcNodeAdvance (
uint256& uDirectTip = pnCur.uDirectTip;
uint256& uDirectEnd = pnCur.uDirectEnd;
bool& bDirectAdvance = pnCur.bDirectAdvance;
bool& bDirectRestart = pnCur.bDirectRestart;
SLE::pointer& sleDirectDir = pnCur.sleDirectDir;
STAmount& saOfrRate = pnCur.saOfrRate;
@@ -73,17 +74,20 @@ TER RippleCalc::calcNodeAdvance (
sleDirectDir = lesActive.entryCache (ltDIR_NODE, uDirectTip);
bDirectDirDirty = !!sleDirectDir; // Associated vars are dirty, if found it.
bDirectAdvance = !sleDirectDir; // Advance, if didn't find it. Normal not to be unable to lookup firstdirectory. Maybe even skip this lookup.
bDirectRestart = false;
WriteLog (lsTRACE, RippleCalc) << boost::str (boost::format ("calcNodeAdvance: Initialize node: uDirectTip=%s uDirectEnd=%s bDirectAdvance=%d") % uDirectTip % uDirectEnd % bDirectAdvance);
}
if (bDirectAdvance)
if (bDirectAdvance || bDirectRestart)
{
// Get next quality.
uDirectTip = lesActive.getNextLedgerIndex (uDirectTip, uDirectEnd);
if (bDirectAdvance)
uDirectTip = lesActive.getNextLedgerIndex (uDirectTip, uDirectEnd);
bDirectDirDirty = true;
bDirectAdvance = false;
bDirectRestart = false;
if (!!uDirectTip)
{
@@ -344,8 +348,12 @@ TER RippleCalc::calcNodeDeliverRev (
STAmount& saPrvDlvReq = pnPrv.saRevDeliver; // Accumulation of what the previous node must deliver.
uint256& uDirectTip = pnCur.uDirectTip;
bool& bDirectRestart = pnCur.bDirectRestart;
uDirectTip = 0; // Restart book searching.
if (bMultiQuality)
uDirectTip = 0; // Restart book searching.
else
bDirectRestart = true; // Restart at same quality.
// YYY Note this gets zeroed on each increment, ideally only on first increment, then it could be a limit on the forward pass.
saOutAct.zero (saOutReq);
@@ -636,8 +644,12 @@ TER RippleCalc::calcNodeDeliverFwd (
STAmount& saCurDeliverAct = pnCur.saFwdDeliver; // Zeroed in reverse pass.
uint256& uDirectTip = pnCur.uDirectTip;
bool& bDirectRestart = pnCur.bDirectRestart;
uDirectTip = 0; // Restart book searching.
if (bMultiQuality)
uDirectTip = 0; // Restart book searching.
else
bDirectRestart = true; // Restart at same quality.
saInAct.zero (saInReq);
saInFees.zero (saInReq);