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

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2013-01-19 14:16:14 -08:00
parent 308ca21b97 4c6920dd55
commit 6bc587b02f
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/cpp/ripple/LedgerConsensus.cpp
View File

@@ -1088,13 +1088,22 @@ void LedgerConsensus::playbackProposals()
} }
} }
bool LedgerConsensus::applyTransaction(TransactionEngine& engine, SerializedTransaction::ref txn, Ledger::ref ledger, #define LCAT_SUCCESS 0
#define LCAT_FAIL 1
#define LCAT_RETRY 2
int LedgerConsensus::applyTransaction(TransactionEngine& engine, SerializedTransaction::ref txn, Ledger::ref ledger,
bool openLedger, bool retryAssured) bool openLedger, bool retryAssured)
{ // Returns false if the transaction has need not be retried. { // Returns false if the transaction has need not be retried.
TransactionEngineParams parms = openLedger ? tapOPEN_LEDGER : tapNONE; TransactionEngineParams parms = openLedger ? tapOPEN_LEDGER : tapNONE;
if (retryAssured) if (retryAssured)
parms = static_cast<TransactionEngineParams>(parms | tapRETRY); parms = static_cast<TransactionEngineParams>(parms | tapRETRY);
cLog(lsDEBUG) << "TXN " << txn->getTransactionID()
<< (openLedger ? " open" : " closed")
<< (retryAssured ? "/retry" : "/final");
cLog(lsTRACE) << txn->getJson(0);
#ifndef TRUST_NETWORK #ifndef TRUST_NETWORK
try try
{ {
@@ -1104,19 +1113,19 @@ bool LedgerConsensus::applyTransaction(TransactionEngine& engine, SerializedTran
TER result = engine.applyTransaction(*txn, parms, didApply); TER result = engine.applyTransaction(*txn, parms, didApply);
if (didApply) if (didApply)
{ {
cLog(lsDEBUG) << "Transaction success"; cLog(lsDEBUG) << "Transaction success: " << transHuman(result);
return false; return LCAT_SUCCESS;
} }
if (isTefFailure(result) || isTemMalformed(result)) if (isTefFailure(result) || isTemMalformed(result))
{ // failure { // failure
cLog(lsDEBUG) << "Transaction failure"; cLog(lsDEBUG) << "Transaction failure: " << transHuman(result);
return false; return LCAT_FAIL;
} }
cLog(lsDEBUG) << "Retry needed"; cLog(lsDEBUG) << "Transaction retry: " << transHuman(result);
assert(!ledger->hasTransaction(txn->getTransactionID())); assert(!ledger->hasTransaction(txn->getTransactionID()));
return true; return LCAT_RETRY;
#ifndef TRUST_NETWORK #ifndef TRUST_NETWORK
} }
@@ -1134,7 +1143,6 @@ void LedgerConsensus::applyTransactions(SHAMap::ref set, Ledger::ref applyLedger
TransactionEngine engine(applyLedger); TransactionEngine engine(applyLedger);
for (SHAMapItem::pointer item = set->peekFirstItem(); !!item; item = set->peekNextItem(item->getTag())) for (SHAMapItem::pointer item = set->peekFirstItem(); !!item; item = set->peekNextItem(item->getTag()))
{
if (!checkLedger->hasTransaction(item->getTag())) if (!checkLedger->hasTransaction(item->getTag()))
{ {
cLog(lsINFO) << "Processing candidate transaction: " << item->getTag(); cLog(lsINFO) << "Processing candidate transaction: " << item->getTag();
@@ -1144,7 +1152,7 @@ void LedgerConsensus::applyTransactions(SHAMap::ref set, Ledger::ref applyLedger
#endif #endif
SerializerIterator sit(item->peekSerializer()); SerializerIterator sit(item->peekSerializer());
SerializedTransaction::pointer txn = boost::make_shared<SerializedTransaction>(boost::ref(sit)); SerializedTransaction::pointer txn = boost::make_shared<SerializedTransaction>(boost::ref(sit));
if (applyTransaction(engine, txn, applyLedger, openLgr, true)) if (applyTransaction(engine, txn, applyLedger, openLgr, true) != LCAT_FAIL)
failedTransactions.push_back(txn); failedTransactions.push_back(txn);
#ifndef TRUST_NETWORK #ifndef TRUST_NETWORK
} }
@@ -1154,13 +1162,14 @@ void LedgerConsensus::applyTransactions(SHAMap::ref set, Ledger::ref applyLedger
} }
#endif #endif
} }
}
int changes; int changes;
bool certainRetry = true; bool certainRetry = true;
for (int pass = 0; pass < 8; ++pass) for (int pass = 0; pass < 8; ++pass)
{ {
cLog(lsDEBUG) << "Pass: " << pass << " Txns: " << failedTransactions.size()
<< (certainRetry ? " retriable" : " final");
changes = 0; changes = 0;
CanonicalTXSet::iterator it = failedTransactions.begin(); CanonicalTXSet::iterator it = failedTransactions.begin();
@@ -1168,20 +1177,28 @@ void LedgerConsensus::applyTransactions(SHAMap::ref set, Ledger::ref applyLedger
{ {
try try
{ {
if (!applyTransaction(engine, it->second, applyLedger, openLgr, certainRetry)) switch (applyTransaction(engine, it->second, applyLedger, openLgr, certainRetry))
{ {
++changes; case LCAT_SUCCESS:
it = failedTransactions.erase(it); it = failedTransactions.erase(it);
++changes;
break;
case LCAT_FAIL:
it = failedTransactions.erase(it);
break;
case LCAT_RETRY:
++it;
} }
else
++it;
} }
catch (...) catch (...)
{ {
cLog(lsWARNING) << " Throws"; cLog(lsWARNING) << "Transaction throws";
it = failedTransactions.erase(it); it = failedTransactions.erase(it);
} }
} }
cLog(lsDEBUG) << "Pass: " << pass << " finished " << changes << " changes";
// A non-retry pass made no changes // A non-retry pass made no changes
if (!changes && !certainRetry) if (!changes && !certainRetry)
@@ -1190,7 +1207,6 @@ void LedgerConsensus::applyTransactions(SHAMap::ref set, Ledger::ref applyLedger
// Stop retriable passes // Stop retriable passes
if ((!changes) || (pass >= 4)) if ((!changes) || (pass >= 4))
certainRetry = false; certainRetry = false;
} }
} }
@@ -1226,6 +1242,7 @@ void LedgerConsensus::accept(SHAMap::ref set, LoadEvent::pointer)
newLCL->peekTransactionMap()->armDirty(); newLCL->peekTransactionMap()->armDirty();
newLCL->peekAccountStateMap()->armDirty(); newLCL->peekAccountStateMap()->armDirty();
cLog(lsDEBUG) << "Applying consensus set transactions to the last closed ledger";
applyTransactions(set, newLCL, newLCL, failedTransactions, false); applyTransactions(set, newLCL, newLCL, failedTransactions, false);
newLCL->updateSkipList(); newLCL->updateSkipList();
newLCL->setClosed(); newLCL->setClosed();
@@ -1286,7 +1303,7 @@ void LedgerConsensus::accept(SHAMap::ref set, LoadEvent::pointer)
{ // we voted NO { // we voted NO
try try
{ {
cLog(lsINFO) << "Test applying disputed transaction that did not get in"; cLog(lsDEBUG) << "Test applying disputed transaction that did not get in";
SerializerIterator sit(it.second->peekTransaction()); SerializerIterator sit(it.second->peekTransaction());
SerializedTransaction::pointer txn = boost::make_shared<SerializedTransaction>(boost::ref(sit)); SerializedTransaction::pointer txn = boost::make_shared<SerializedTransaction>(boost::ref(sit));
if (applyTransaction(engine, txn, newOL, true, false)) if (applyTransaction(engine, txn, newOL, true, false))
@@ -1294,12 +1311,12 @@ void LedgerConsensus::accept(SHAMap::ref set, LoadEvent::pointer)
} }
catch (...) catch (...)
{ {
cLog(lsINFO) << "Failed to apply transaction we voted NO on"; cLog(lsDEBUG) << "Failed to apply transaction we voted NO on";
} }
} }
} }
cLog(lsINFO) << "Applying transactions from current ledger"; cLog(lsDEBUG) << "Applying transactions from current open ledger";
applyTransactions(theApp->getLedgerMaster().getCurrentLedger()->peekTransactionMap(), newOL, newLCL, applyTransactions(theApp->getLedgerMaster().getCurrentLedger()->peekTransactionMap(), newOL, newLCL,
failedTransactions, true); failedTransactions, true);
theApp->getLedgerMaster().pushLedger(newLCL, newOL, !mConsensusFail); theApp->getLedgerMaster().pushLedger(newLCL, newOL, !mConsensusFail);

2
src/cpp/ripple/LedgerConsensus.h
View File

@@ -140,7 +140,7 @@ protected:
void sendHaveTxSet(const uint256& set, bool direct); void sendHaveTxSet(const uint256& set, bool direct);
void applyTransactions(SHAMap::ref transactionSet, Ledger::ref targetLedger, void applyTransactions(SHAMap::ref transactionSet, Ledger::ref targetLedger,
Ledger::ref checkLedger, CanonicalTXSet& failedTransactions, bool openLgr); Ledger::ref checkLedger, CanonicalTXSet& failedTransactions, bool openLgr);
bool applyTransaction(TransactionEngine& engine, SerializedTransaction::ref txn, Ledger::ref targetLedger, int applyTransaction(TransactionEngine& engine, SerializedTransaction::ref txn, Ledger::ref targetLedger,
bool openLgr, bool retryAssured); bool openLgr, bool retryAssured);
uint32 roundCloseTime(uint32 closeTime); uint32 roundCloseTime(uint32 closeTime);