ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small bugfixes.

Browse Source
This commit is contained in:
JoelKatz
2012-08-29 14:39:43 -07:00
parent 45329b8d08
commit 5db8082608
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/LedgerConsensus.cpp
View File

@@ -431,7 +431,7 @@ void LedgerConsensus::statePreClose()
{ // it is time to close the ledger
Log(lsINFO) << "CLC: closing ledger";
mState = lcsESTABLISH;
mConsensusStartTime = boost::posix_time::second_clock::universal_time();
mConsensusStartTime = boost::posix_time::microsec_clock::universal_time();
mCloseTime = theApp->getOPs().getCloseTimeNC();
theApp->getOPs().setLastCloseNetTime(mCloseTime);
statusChange(newcoin::neCLOSING_LEDGER, *mPreviousLedger);
@@ -492,7 +492,7 @@ void LedgerConsensus::timerEntry()
}
mCurrentMSeconds = (mCloseTime == 0) ? 0 :
(boost::posix_time::second_clock::universal_time() - mConsensusStartTime).total_milliseconds();
(boost::posix_time::microsec_clock::universal_time() - mConsensusStartTime).total_milliseconds();
mClosePercent = mCurrentMSeconds * 100 / mPreviousMSeconds;
switch (mState)

2
src/LedgerTiming.cpp
View File

@@ -33,7 +33,7 @@ int ContinuousLedgerTiming::shouldClose(
{ // no transactions so far this interval
if (proposersClosed > (previousProposers / 4)) // did we miss a transaction?
{
Log(lsTRACE) << "no transactions, many proposers: now (" << proposersClose << "closed, "
Log(lsTRACE) << "no transactions, many proposers: now (" << proposersClosed << "closed, "
<< previousProposers << " before)";
return currentMSeconds;
}

3
src/NetworkOPs.cpp
View File

@@ -33,7 +33,7 @@ boost::posix_time::ptime NetworkOPs::getNetworkTimePT()
{
int offset = 0;
theApp->getSystemTimeOffset(offset);
return boost::posix_time::second_clock::universal_time() + boost::posix_time::seconds(offset);
return boost::posix_time::microsec_clock::universal_time() + boost::posix_time::seconds(offset);
}
uint32 NetworkOPs::getNetworkTimeNC()
@@ -634,6 +634,7 @@ bool NetworkOPs::recvPropose(uint32 proposeSeq, const uint256& proposeHash, uint
if ((!mConsensus) && (mMode == omFULL))
{
uint256 networkClosed;
std::vector<Peer::pointer> peerList = theApp->getConnectionPool().getPeerVector();
bool ledgerChange = checkLastClosedLedger(peerList, networkClosed);
if (!ledgerChange)
{