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

Small bugfixes and logging improvements.

Browse Source
This commit is contained in:
JoelKatz
2012-10-24 12:27:45 -07:00
parent 2aec337c1b
commit b44ef50039
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/LedgerAcquire.cpp
View File

@@ -646,6 +646,8 @@ void LedgerAcquireSet::onComplete(boost::weak_ptr<LedgerAcquireSet> set, LedgerA
if (acquired->isComplete())
{
Ledger::pointer ledger = acquired->getLedger();
assert(ledger);
cLog(lsDEBUG) << "LedgerAcquireSet::onComplete " << ledger->getLedgerSeq();
ledger->setAccepted();
theApp->getMasterLedger().checkLedgerGap(ledger);
lSet->updateCurrentLedger(ledger);

16
src/LedgerMaster.cpp
View File

@@ -7,6 +7,8 @@
#include "NewcoinAddress.h"
#include "Log.h"
SETUP_LOG();
uint32 LedgerMaster::getCurrentLedgerIndex()
{
return mCurrentLedger->getLedgerSeq();
@@ -22,12 +24,12 @@ void LedgerMaster::pushLedger(Ledger::ref newLedger)
{
// Caller should already have properly assembled this ledger into "ready-to-close" form --
// all candidate transactions must already be applied
Log(lsINFO) << "PushLedger: " << newLedger->getHash();
cLog(lsINFO) << "PushLedger: " << newLedger->getHash();
boost::recursive_mutex::scoped_lock ml(mLock);
if (!!mFinalizedLedger)
{
mFinalizedLedger->setClosed();
Log(lsTRACE) << "Finalizes: " << mFinalizedLedger->getHash();
cLog(lsTRACE) << "Finalizes: " << mFinalizedLedger->getHash();
}
mFinalizedLedger = mCurrentLedger;
mCurrentLedger = newLedger;
@@ -48,7 +50,7 @@ void LedgerMaster::pushLedger(Ledger::ref newLCL, Ledger::ref newOL)
mLedgerHistory.addAcceptedLedger(newLCL, false);
if (mLastFullLedger && (newLCL->getParentHash() == mLastFullLedger->getHash()))
mLastFullLedger = newLCL;
Log(lsINFO) << "StashAccepted: " << newLCL->getHash();
cLog(lsINFO) << "StashAccepted: " << newLCL->getHash();
}
boost::recursive_mutex::scoped_lock ml(mLock);
@@ -99,21 +101,25 @@ TER LedgerMaster::doTransaction(const SerializedTransaction& txn, TransactionEng
void LedgerMaster::checkLedgerGap(Ledger::ref ledger)
{
cLog(lsTRACE) << "Checking for ledger gap";
boost::recursive_mutex::scoped_lock sl(mLock);
if (ledger->getParentHash() == mLastFullLedger->getHash())
if (mLastFullLedger && (ledger->getParentHash() == mLastFullLedger->getHash()))
{
mLastFullLedger = ledger;
cLog(lsTRACE) << "Perfect fit, no gap";
return;
}
if (theApp->getMasterLedgerAcquire().hasSet())
return;
if (ledger->getLedgerSeq() < mLastFullLedger->getLedgerSeq())
if (mLastFullLedger && (ledger->getLedgerSeq() < mLastFullLedger->getLedgerSeq()))
return;
// we have a gap or discontinuity
cLog(lsWARNING) << "Ledger gap found " <<
(mLastFullLedger ? mLastFullLedger->getLedgerSeq() : 0) << " - " << ledger->getLedgerSeq();
theApp->getMasterLedgerAcquire().makeSet(mLastFullLedger, ledger);
}