Separate close times and network times.

This commit is contained in:
JoelKatz
2012-08-06 02:12:27 -07:00
parent 05e193f370
commit b14b2f5dab
6 changed files with 18 additions and 15 deletions

View File

@@ -404,7 +404,7 @@ void LedgerConsensus::statePreClose()
int proposersClosed = mPeerPositions.size();
// This ledger is open. This computes how long since the last ledger closed
int sinceClose = 1000 * (theApp->getOPs().getNetworkTimeNC() - theApp->getOPs().getLastCloseNetTime());
int sinceClose = 1000 * (theApp->getOPs().getCloseTimeNC() - theApp->getOPs().getLastCloseNetTime());
if (sinceClose >= ContinuousLedgerTiming::shouldClose(anyTransactions, mPreviousProposers, proposersClosed,
mPreviousMSeconds, sinceClose))
@@ -412,7 +412,7 @@ void LedgerConsensus::statePreClose()
Log(lsINFO) << "CLC: closing ledger";
mState = lcsESTABLISH;
mConsensusStartTime = boost::posix_time::second_clock::universal_time();
mCloseTime = theApp->getOPs().getNetworkTimeNC();
mCloseTime = theApp->getOPs().getCloseTimeNC();
theApp->getOPs().setLastCloseNetTime(mCloseTime);
statusChange(newcoin::neCLOSING_LEDGER, *mPreviousLedger);
takeInitialPosition(*theApp->getMasterLedger().closeLedger());
@@ -930,7 +930,7 @@ void LedgerConsensus::accept(SHAMap::pointer set)
closeTotal += (closeCount / 2);
closeTotal /= closeCount;
int offset = static_cast<int>(closeTotal) - static_cast<int>(mCloseTime);
Log(lsINFO) << "Our clock offset is estimated at " << offset;
Log(lsINFO) << "Our close offset is estimated at " << offset << " (" << closeCount << ")";
}
#ifdef DEBUG