ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 22:15:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cache_snapshot' into develop

Browse Source
This commit is contained in:
JoelKatz
2013-05-20 11:56:36 -07:00
parent cb9eff134a 0671412ab9
commit dedb8ff945
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/cpp/ripple/RPCHandler.cpp
View File

@@ -177,8 +177,7 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit)
return rpcError(rpcINVALID_PARAMS);
}
Ledger::pointer lSnapshot = boost::make_shared<Ledger>(
boost::ref(*mNetOps->getCurrentLedger()), false);
Ledger::pointer lSnapshot = mNetOps->getCurrentSnapshot();
{
ScopedUnlock su(theApp->getMasterLock());
bool bValid;
@@ -1031,6 +1030,9 @@ Json::Value RPCHandler::doAccountLines(Json::Value jvRequest, int& cost, ScopedL
if (!lpLedger)
return jvResult;
if (lpLedger->isImmutable())
MasterLockHolder.unlock();
if (!jvRequest.isMember("account"))
return rpcError(rpcINVALID_PARAMS);
@@ -1065,9 +1067,6 @@ Json::Value RPCHandler::doAccountLines(Json::Value jvRequest, int& cost, ScopedL
AccountState::pointer as = mNetOps->getAccountState(lpLedger, raAccount);
if (lpLedger->isImmutable())
MasterLockHolder.unlock();
if (as)
{
jvResult["account"] = raAccount.humanAccountID();
@@ -1124,6 +1123,9 @@ Json::Value RPCHandler::doAccountOffers(Json::Value jvRequest, int& cost, Scoped
if (!lpLedger)
return jvResult;
if (lpLedger->isImmutable())
MasterLockHolder.unlock();
if (!jvRequest.isMember("account"))
return rpcError(rpcINVALID_PARAMS);
@@ -1852,6 +1854,9 @@ Json::Value RPCHandler::doLedger(Json::Value jvRequest, int& cost, ScopedLock& M
if (!lpLedger)
return jvResult;
if (lpLedger->isImmutable())
MasterLockHolder.unlock();
bool bFull = jvRequest.isMember("full") && jvRequest["full"].asBool();
bool bTransactions = jvRequest.isMember("transactions") && jvRequest["transactions"].asBool();
bool bAccounts = jvRequest.isMember("accounts") && jvRequest["accounts"].asBool();
@@ -1861,15 +1866,6 @@ Json::Value RPCHandler::doLedger(Json::Value jvRequest, int& cost, ScopedLock& M
| (bTransactions ? LEDGER_JSON_DUMP_TXRP : 0)
| (bAccounts ? LEDGER_JSON_DUMP_STATE : 0);
if ((bFull || bAccounts) && !lpLedger->isImmutable())
{ // For full or accounts, it's cheaper to snapshot
lpLedger = boost::make_shared<Ledger>(*lpLedger, false);
assert(lpLedger->isImmutable());
}
if (lpLedger->isImmutable())
MasterLockHolder.unlock();
Json::Value ret(Json::objectValue);
lpLedger->addJson(ret, iOptions);
@@ -2612,7 +2608,7 @@ Json::Value RPCHandler::lookupLedger(Json::Value jvRequest, Ledger::pointer& lpL
switch (iLedgerIndex) {
case LEDGER_CURRENT:
lpLedger = mNetOps->getCurrentLedger();
lpLedger = mNetOps->getCurrentSnapshot();
iLedgerIndex = lpLedger->getLedgerSeq();
break;