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 'faster_clientops' into develop

Browse Source
This commit is contained in:
JoelKatz
2013-05-14 18:44:42 -07:00
parent 9489bd8da0 c4345768e7
commit 7855c4d642
7 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/ripple/LedgerEntrySet.cpp
View File

@@ -94,7 +94,7 @@ SLE::pointer LedgerEntrySet::entryCache(LedgerEntryType letType, const uint256&
if (!sleEntry)
{
assert(action != taaDELETE);
sleEntry = mLedger->getSLE(index);
sleEntry = mImmutable ? mLedger->getSLEi(index) : mLedger->getSLE(index);
if (sleEntry)
entryCache(sleEntry);
}
@@ -115,7 +115,7 @@ LedgerEntryAction LedgerEntrySet::hasEntry(const uint256& index) const
void LedgerEntrySet::entryCache(SLE::ref sle)
{
assert(mLedger);
assert(sle->isMutable());
assert(sle->isMutable() || mImmutable); // Don't put an immutable SLE in a mutable LES
std::map<uint256, LedgerEntrySetEntry>::iterator it = mEntries.find(sle->getIndex());
if (it == mEntries.end())
{
@@ -138,7 +138,7 @@ void LedgerEntrySet::entryCache(SLE::ref sle)
void LedgerEntrySet::entryCreate(SLE::ref sle)
{
assert(mLedger);
assert(mLedger && !mImmutable);
assert(sle->isMutable());
std::map<uint256, LedgerEntrySetEntry>::iterator it = mEntries.find(sle->getIndex());
if (it == mEntries.end())
@@ -175,7 +175,7 @@ void LedgerEntrySet::entryCreate(SLE::ref sle)
void LedgerEntrySet::entryModify(SLE::ref sle)
{
assert(sle->isMutable());
assert(sle->isMutable() && !mImmutable);
assert(mLedger);
std::map<uint256, LedgerEntrySetEntry>::iterator it = mEntries.find(sle->getIndex());
if (it == mEntries.end())
@@ -209,7 +209,7 @@ void LedgerEntrySet::entryModify(SLE::ref sle)
void LedgerEntrySet::entryDelete(SLE::ref sle)
{
assert(sle->isMutable());
assert(sle->isMutable() && !mImmutable);
assert(mLedger);
std::map<uint256, LedgerEntrySetEntry>::iterator it = mEntries.find(sle->getIndex());
if (it == mEntries.end())

11
src/cpp/ripple/LedgerEntrySet.h
View File

@@ -56,9 +56,11 @@ protected:
TransactionMetaSet mSet;
TransactionEngineParams mParams;
int mSeq;
bool mImmutable;
LedgerEntrySet(Ledger::ref ledger, const std::map<uint256, LedgerEntrySetEntry> &e,
const TransactionMetaSet& s, int m) : mLedger(ledger), mEntries(e), mSet(s), mParams(tapNONE), mSeq(m) { ; }
const TransactionMetaSet& s, int m) :
mLedger(ledger), mEntries(e), mSet(s), mParams(tapNONE), mSeq(m), mImmutable(false) { ; }
SLE::pointer getForMod(const uint256& node, Ledger::ref ledger,
boost::unordered_map<uint256, SLE::pointer>& newMods);
@@ -72,11 +74,14 @@ protected:
public:
LedgerEntrySet(Ledger::ref ledger, TransactionEngineParams tep) : mLedger(ledger), mParams(tep), mSeq(0) { ; }
LedgerEntrySet(Ledger::ref ledger, TransactionEngineParams tep, bool immutable = false) :
mLedger(ledger), mParams(tep), mSeq(0), mImmutable(immutable) { ; }
LedgerEntrySet() : mParams(tapNONE), mSeq(0) { ; }
LedgerEntrySet() : mParams(tapNONE), mSeq(0), mImmutable(false) { ; }
// set functions
void setImmutable() { mImmutable = true; }
bool isImmutable() const { return mImmutable; }
LedgerEntrySet duplicate() const; // Make a duplicate of this set
void setTo(const LedgerEntrySet&); // Set this set to have the same contents as another
void swapWith(LedgerEntrySet&); // Swap the contents of two sets

2
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -1854,7 +1854,7 @@ void NetworkOPs::getBookPage(Ledger::pointer lpLedger, const uint160& uTakerPays
cLog(lsTRACE) << boost::str(boost::format("getBookPage: uBookEnd=%s") % uBookEnd);
cLog(lsTRACE) << boost::str(boost::format("getBookPage: uTipIndex=%s") % uTipIndex);
LedgerEntrySet lesActive(lpLedger, tapNONE);
LedgerEntrySet lesActive(lpLedger, tapNONE, true);
bool bDone = false;
bool bDirectAdvance = true;

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

@@ -52,6 +52,8 @@ public:
virtual ~InfoSub();
virtual void send(const Json::Value& jvObj, bool broadcast) = 0;
virtual void send(const Json::Value& jvObj, const std::string& sObj, bool broadcast)
{ send(jvObj, broadcast); }
uint64 getSeq()
{

17
src/cpp/ripple/OrderBookDB.cpp
View File

@@ -167,13 +167,13 @@ void OrderBookDB::processTxn(Ledger::ref ledger, const ALTransaction& alTx, Json
const STObject* data = dynamic_cast<const STObject*>(node.peekAtPField(*field));
if (data)
{
STAmount takerGets = data->getFieldAmount(sfTakerGets);
uint160 currencyGets = takerGets.getCurrency();
uint160 issuerGets = takerGets.getIssuer();
const STAmount& takerGets = data->getFieldAmount(sfTakerGets);
const uint160& currencyGets = takerGets.getCurrency();
const uint160& issuerGets = takerGets.getIssuer();
STAmount takerPays = data->getFieldAmount(sfTakerPays);
uint160 currencyPays = takerPays.getCurrency();
uint160 issuerPays = takerPays.getIssuer();
const STAmount& takerPays = data->getFieldAmount(sfTakerPays);
const uint160& currencyPays = takerPays.getCurrency();
const uint160& issuerPays = takerPays.getIssuer();
// determine the OrderBook
BookListeners::pointer book =
@@ -206,6 +206,9 @@ void BookListeners::removeSubscriber(uint64 seq)
void BookListeners::publish(Json::Value& jvObj)
{
Json::FastWriter jfwWriter;
std::string sObj = jfwWriter.write(jvObj);
boost::recursive_mutex::scoped_lock sl(mLock);
NetworkOPs::subMapType::const_iterator it = mListeners.begin();
while (it != mListeners.end())
@@ -213,7 +216,7 @@ void BookListeners::publish(Json::Value& jvObj)
InfoSub::pointer p = it->second.lock();
if (p)
{
p->send(jvObj, true);
p->send(jvObj, sObj, true);
++it;
}
else

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

@@ -1202,12 +1202,15 @@ Json::Value RPCHandler::doBookOffers(Json::Value jvRequest, int& cost, ScopedLoc
if (!lpLedger)
return jvResult;
if (lpLedger->isImmutable())
MasterLockHolder.unlock();
if (!jvRequest.isMember("taker_pays") || !jvRequest.isMember("taker_gets") || !jvRequest["taker_pays"].isObject() || !jvRequest["taker_gets"].isObject())
return rpcError(rpcINVALID_PARAMS);
uint160 uTakerPaysCurrencyID;
uint160 uTakerPaysIssuerID;
Json::Value jvTakerPays = jvRequest["taker_pays"];
uint160 uTakerPaysCurrencyID;
uint160 uTakerPaysIssuerID;
const Json::Value& jvTakerPays = jvRequest["taker_pays"];
// Parse mandatory currency.
if (!jvTakerPays.isMember("currency")
@@ -1230,9 +1233,9 @@ Json::Value RPCHandler::doBookOffers(Json::Value jvRequest, int& cost, ScopedLoc
return rpcError(rpcSRC_ISR_MALFORMED);
}
uint160 uTakerGetsCurrencyID;
uint160 uTakerGetsIssuerID;
Json::Value jvTakerGets = jvRequest["taker_gets"];
uint160 uTakerGetsCurrencyID;
uint160 uTakerGetsIssuerID;
const Json::Value& jvTakerGets = jvRequest["taker_gets"];
// Parse mandatory currency.
if (!jvTakerGets.isMember("currency")

7
src/cpp/ripple/WSConnection.h
View File

@@ -95,6 +95,13 @@ public:
mHandler->send(ptr, jvObj, broadcast);
}
void send(const Json::Value& jvObj, const std::string& sObj, bool broadcast)
{
connection_ptr ptr = mConnection.lock();
if (ptr)
mHandler->send(ptr, sObj, broadcast);
}
// Utilities
Json::Value invokeCommand(Json::Value& jvRequest)
{