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

Cleanly destroy Application on exit

Browse Source
This commit is contained in:
Vinnie Falco
2013-06-30 04:21:07 -07:00
parent 68179cfce3
commit 0deaeb1000
42 changed files with 949 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/cpp/ripple/Ledger.cpp
View File

@@ -135,7 +135,7 @@ Ledger::Ledger (bool /* dummy */,
if (prevLedger.mCloseTime == 0)
{
mCloseTime = roundCloseTime (theApp->getOPs ().getCloseTimeNC (), mCloseResolution);
mCloseTime = roundCloseTime (getApp().getOPs ().getCloseTimeNC (), mCloseResolution);
}
else
{
@@ -345,7 +345,7 @@ Transaction::pointer Ledger::getTransaction (uint256 const& transID) const
if (!item) return Transaction::pointer ();
Transaction::pointer txn = theApp->getMasterTransaction ().fetch (transID, false);
Transaction::pointer txn = getApp().getMasterTransaction ().fetch (transID, false);
if (txn)
return txn;
@@ -371,7 +371,7 @@ Transaction::pointer Ledger::getTransaction (uint256 const& transID) const
if (txn->getStatus () == NEW)
txn->setStatus (mClosed ? COMMITTED : INCLUDED, mLedgerSeq);
theApp->getMasterTransaction ().canonicalize (txn, false);
getApp().getMasterTransaction ().canonicalize (txn, false);
return txn;
}
@@ -425,7 +425,7 @@ bool Ledger::getTransaction (uint256 const& txID, Transaction::pointer& txn, Tra
if (type == SHAMapTreeNode::tnTRANSACTION_NM)
{
// in tree with no metadata
txn = theApp->getMasterTransaction ().fetch (txID, false);
txn = getApp().getMasterTransaction ().fetch (txID, false);
meta.reset ();
if (!txn)
@@ -435,7 +435,7 @@ bool Ledger::getTransaction (uint256 const& txID, Transaction::pointer& txn, Tra
{
// in tree with metadata
SerializerIterator it (item->peekSerializer ());
txn = theApp->getMasterTransaction ().fetch (txID, false);
txn = getApp().getMasterTransaction ().fetch (txID, false);
if (!txn)
txn = Transaction::sharedTransaction (it.getVL (), true);
@@ -450,7 +450,7 @@ bool Ledger::getTransaction (uint256 const& txID, Transaction::pointer& txn, Tra
if (txn->getStatus () == NEW)
txn->setStatus (mClosed ? COMMITTED : INCLUDED, mLedgerSeq);
theApp->getMasterTransaction ().canonicalize (txn, false);
getApp().getMasterTransaction ().canonicalize (txn, false);
return true;
}
@@ -531,18 +531,18 @@ void Ledger::saveAcceptedLedger (Job&, bool fromConsensus)
Serializer s (128);
s.add32 (HashPrefix::ledgerMaster);
addRaw (s);
theApp->getHashedObjectStore ().store (hotLEDGER, mLedgerSeq, s.peekData (), mHash);
getApp().getHashedObjectStore ().store (hotLEDGER, mLedgerSeq, s.peekData (), mHash);
AcceptedLedger::pointer aLedger = AcceptedLedger::makeAcceptedLedger (shared_from_this ());
{
ScopedLock sl (theApp->getLedgerDB ()->getDBLock ());
theApp->getLedgerDB ()->getDB ()->executeSQL (boost::str (deleteLedger % mLedgerSeq));
ScopedLock sl (getApp().getLedgerDB ()->getDBLock ());
getApp().getLedgerDB ()->getDB ()->executeSQL (boost::str (deleteLedger % mLedgerSeq));
}
{
Database* db = theApp->getTxnDB ()->getDB ();
ScopedLock dbLock (theApp->getTxnDB ()->getDBLock ());
Database* db = getApp().getTxnDB ()->getDB ();
ScopedLock dbLock (getApp().getTxnDB ()->getDBLock ());
db->executeSQL ("BEGIN TRANSACTION;");
db->executeSQL (boost::str (deleteTrans1 % mLedgerSeq));
@@ -551,7 +551,7 @@ void Ledger::saveAcceptedLedger (Job&, bool fromConsensus)
BOOST_FOREACH (const AcceptedLedger::value_type & vt, aLedger->getMap ())
{
uint256 txID = vt.second->getTransactionID ();
theApp->getMasterTransaction ().inLedger (txID, mLedgerSeq);
getApp().getMasterTransaction ().inLedger (txID, mLedgerSeq);
db->executeSQL (boost::str (deleteAcctTrans % txID.GetHex ()));
@@ -596,8 +596,8 @@ void Ledger::saveAcceptedLedger (Job&, bool fromConsensus)
}
{
ScopedLock sl (theApp->getLedgerDB ()->getDBLock ());
theApp->getLedgerDB ()->getDB ()->executeSQL (boost::str (addLedger %
ScopedLock sl (getApp().getLedgerDB ()->getDBLock ());
getApp().getLedgerDB ()->getDB ()->executeSQL (boost::str (addLedger %
getHash ().GetHex () % mLedgerSeq % mParentHash.GetHex () %
boost::lexical_cast<std::string> (mTotCoins) % mCloseTime % mParentCloseTime %
mCloseResolution % mCloseFlags % mAccountHash.GetHex () % mTransHash.GetHex ()));
@@ -606,8 +606,8 @@ void Ledger::saveAcceptedLedger (Job&, bool fromConsensus)
if (!fromConsensus && (theConfig.NODE_SIZE < 2)) // tiny or small
dropCache ();
if (theApp->getJobQueue ().getJobCountTotal (jtPUBOLDLEDGER) < 2)
theApp->getLedgerMaster ().resumeAcquiring ();
if (getApp().getJobQueue ().getJobCountTotal (jtPUBOLDLEDGER) < 2)
getApp().getLedgerMaster ().resumeAcquiring ();
else
WriteLog (lsTRACE, Ledger) << "no resume, too many pending ledger saves";
}
@@ -618,8 +618,8 @@ Ledger::pointer Ledger::loadByIndex (uint32 ledgerIndex)
{
Ledger::pointer ledger;
{
Database* db = theApp->getLedgerDB ()->getDB ();
ScopedLock sl (theApp->getLedgerDB ()->getDBLock ());
Database* db = getApp().getLedgerDB ()->getDB ();
ScopedLock sl (getApp().getLedgerDB ()->getDBLock ());
SqliteStatement pSt (db->getSqliteDB (), "SELECT "
"LedgerHash,PrevHash,AccountSetHash,TransSetHash,TotalCoins,"
@@ -643,8 +643,8 @@ Ledger::pointer Ledger::loadByHash (uint256 const& ledgerHash)
{
Ledger::pointer ledger;
{
Database* db = theApp->getLedgerDB ()->getDB ();
ScopedLock sl (theApp->getLedgerDB ()->getDBLock ());
Database* db = getApp().getLedgerDB ()->getDB ();
ScopedLock sl (getApp().getLedgerDB ()->getDBLock ());
SqliteStatement pSt (db->getSqliteDB (), "SELECT "
"LedgerHash,PrevHash,AccountSetHash,TransSetHash,TotalCoins,"
@@ -698,8 +698,8 @@ Ledger::pointer Ledger::getSQL (const std::string& sql)
std::string hash;
{
Database* db = theApp->getLedgerDB ()->getDB ();
ScopedLock sl (theApp->getLedgerDB ()->getDBLock ());
Database* db = getApp().getLedgerDB ()->getDB ();
ScopedLock sl (getApp().getLedgerDB ()->getDBLock ());
if (!db->executeSQL (sql) || !db->startIterRows ())
return Ledger::pointer ();
@@ -731,7 +731,7 @@ Ledger::pointer Ledger::getSQL (const std::string& sql)
ret->setClosed ();
if (theApp->getOPs ().haveLedger (ledgerSeq))
if (getApp().getOPs ().haveLedger (ledgerSeq))
ret->setAccepted ();
if (ret->getHash () != ledgerHash)
@@ -798,7 +798,7 @@ void Ledger::getSQL2 (Ledger::ref ret)
ret->setClosed ();
ret->setImmutable ();
if (theApp->getOPs ().haveLedger (ret->getLedgerSeq ()))
if (getApp().getOPs ().haveLedger (ret->getLedgerSeq ()))
ret->setAccepted ();
WriteLog (lsTRACE, Ledger) << "Loaded ledger: " << ret->getHash ().GetHex ();
@@ -814,8 +814,8 @@ uint256 Ledger::getHashByIndex (uint32 ledgerIndex)
std::string hash;
{
Database* db = theApp->getLedgerDB ()->getDB ();
ScopedLock sl (theApp->getLedgerDB ()->getDBLock ());
Database* db = getApp().getLedgerDB ()->getDB ();
ScopedLock sl (getApp().getLedgerDB ()->getDBLock ());
if (!db->executeSQL (sql) || !db->startIterRows ())
return ret;
@@ -832,7 +832,7 @@ bool Ledger::getHashesByIndex (uint32 ledgerIndex, uint256& ledgerHash, uint256&
{
#ifndef NO_SQLITE3_PREPARE
DatabaseCon* con = theApp->getLedgerDB ();
DatabaseCon* con = getApp().getLedgerDB ();
ScopedLock sl (con->getDBLock ());
SqliteStatement pSt (con->getDB ()->getSqliteDB (),
@@ -868,8 +868,8 @@ bool Ledger::getHashesByIndex (uint32 ledgerIndex, uint256& ledgerHash, uint256&
std::string hash, prevHash;
{
Database* db = theApp->getLedgerDB ()->getDB ();
ScopedLock sl (theApp->getLedgerDB ()->getDBLock ());
Database* db = getApp().getLedgerDB ()->getDB ();
ScopedLock sl (getApp().getLedgerDB ()->getDBLock ());
if (!db->executeSQL (sql) || !db->startIterRows ())
return false;
@@ -893,7 +893,7 @@ std::map< uint32, std::pair<uint256, uint256> > Ledger::getHashesByIndex (uint32
{
#ifndef NO_SQLITE_PREPARE
std::map< uint32, std::pair<uint256, uint256> > ret;
DatabaseCon* con = theApp->getLedgerDB ();
DatabaseCon* con = getApp().getLedgerDB ();
ScopedLock sl (con->getDBLock ());
SqliteStatement pSt (con->getDB ()->getSqliteDB (),
@@ -1150,13 +1150,13 @@ SLE::pointer Ledger::getSLEi (uint256 const& uId)
if (!node)
return SLE::pointer ();
SLE::pointer ret = theApp->getSLECache ().fetch (hash);
SLE::pointer ret = getApp().getSLECache ().fetch (hash);
if (!ret)
{
ret = boost::make_shared<SLE> (node->peekSerializer (), node->getTag ());
ret->setImmutable ();
theApp->getSLECache ().canonicalize (hash, ret);
getApp().getSLECache ().canonicalize (hash, ret);
}
return ret;
@@ -1811,12 +1811,12 @@ uint32 Ledger::roundCloseTime (uint32 closeTime, uint32 closeResolution)
void Ledger::pendSave (bool fromConsensus)
{
if (!fromConsensus && !theApp->getHashRouter ().setFlag (getHash (), SF_SAVED))
if (!fromConsensus && !getApp().getHashRouter ().setFlag (getHash (), SF_SAVED))
return;
assert (isImmutable ());
theApp->getJobQueue ().addJob (
getApp().getJobQueue ().addJob (
fromConsensus ? jtPUBLEDGER : jtPUBOLDLEDGER,
fromConsensus ? "Ledger::pendSave" : "Ledger::pendOldSave",
BIND_TYPE (&Ledger::saveAcceptedLedger, shared_from_this (), P_1, fromConsensus));
@@ -1879,7 +1879,7 @@ uint64 Ledger::scaleFeeBase (uint64 fee)
if (!mBaseFee)
updateFees ();
return theApp->getFeeTrack ().scaleFeeBase (fee, mBaseFee, mReferenceFeeUnits);
return getApp().getFeeTrack ().scaleFeeBase (fee, mBaseFee, mReferenceFeeUnits);
}
uint64 Ledger::scaleFeeLoad (uint64 fee, bool bAdmin)
@@ -1887,7 +1887,7 @@ uint64 Ledger::scaleFeeLoad (uint64 fee, bool bAdmin)
if (!mBaseFee)
updateFees ();
return theApp->getFeeTrack ().scaleFeeLoad (fee, mBaseFee, mReferenceFeeUnits, bAdmin);
return getApp().getFeeTrack ().scaleFeeLoad (fee, mBaseFee, mReferenceFeeUnits, bAdmin);
}
std::vector<uint256> Ledger::getNeededTransactionHashes (int max, SHAMapSyncFilter* filter)