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

Release master lock while getting nodes from a mutable ledger for a peer.

Browse Source
This commit is contained in:
JoelKatz
2013-05-17 03:16:04 -07:00
parent 968618a50c
commit b6b455ab37
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpp/ripple/Peer.cpp
View File

@@ -438,7 +438,7 @@ void Peer::processReadBuffer()
LoadEvent::autoptr event(theApp->getJobQueue().getLoadEventAP(jtPEER, "Peer::read")); LoadEvent::autoptr event(theApp->getJobQueue().getLoadEventAP(jtPEER, "Peer::read"));
boost::recursive_mutex::scoped_lock sl(theApp->getMasterLock()); ScopedLock sl(theApp->getMasterLock());
// If connected and get a mtHELLO or if not connected and get a non-mtHELLO, wrong message was sent. // If connected and get a mtHELLO or if not connected and get a non-mtHELLO, wrong message was sent.
if (mHelloed == (type == ripple::mtHELLO)) if (mHelloed == (type == ripple::mtHELLO))
@@ -601,7 +601,7 @@ void Peer::processReadBuffer()
event->reName("Peer::getledger"); event->reName("Peer::getledger");
ripple::TMGetLedger msg; ripple::TMGetLedger msg;
if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) if (msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE))
recvGetLedger(msg); recvGetLedger(msg, sl);
else else
cLog(lsWARNING) << "parse error: " << type; cLog(lsWARNING) << "parse error: " << type;
} }
@@ -866,7 +866,6 @@ static void checkTransaction(Job&, int flags, SerializedTransaction::pointer stx
void Peer::recvTransaction(ripple::TMTransaction& packet) void Peer::recvTransaction(ripple::TMTransaction& packet)
{ {
Transaction::pointer tx; Transaction::pointer tx;
#ifndef TRUST_NETWORK #ifndef TRUST_NETWORK
try try
@@ -1417,7 +1416,7 @@ void Peer::recvStatus(ripple::TMStatusChange& packet)
mMaxLedger = packet.lastseq(); mMaxLedger = packet.lastseq();
} }
void Peer::recvGetLedger(ripple::TMGetLedger& packet) void Peer::recvGetLedger(ripple::TMGetLedger& packet, ScopedLock& MasterLockHolder)
{ {
SHAMap::pointer map; SHAMap::pointer map;
ripple::TMLedgerData reply; ripple::TMLedgerData reply;
@@ -1545,6 +1544,13 @@ void Peer::recvGetLedger(ripple::TMGetLedger& packet)
return; return;
} }
if (ledger->isImmutable())
MasterLockHolder.unlock();
else
{
cLog(lsWARNING) << "Request for data from mutable ledger";
}
// Fill out the reply // Fill out the reply
uint256 lHash = ledger->getHash(); uint256 lHash = ledger->getHash();
reply.set_ledgerhash(lHash.begin(), lHash.size()); reply.set_ledgerhash(lHash.begin(), lHash.size());

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

@@ -100,7 +100,7 @@ protected:
void recvSearchTransaction(ripple::TMSearchTransaction& packet); void recvSearchTransaction(ripple::TMSearchTransaction& packet);
void recvGetAccount(ripple::TMGetAccount& packet); void recvGetAccount(ripple::TMGetAccount& packet);
void recvAccount(ripple::TMAccount& packet); void recvAccount(ripple::TMAccount& packet);
void recvGetLedger(ripple::TMGetLedger& packet); void recvGetLedger(ripple::TMGetLedger& packet, ScopedLock& MasterLockHolder);
void recvLedger(const boost::shared_ptr<ripple::TMLedgerData>& packet); void recvLedger(const boost::shared_ptr<ripple::TMLedgerData>& packet);
void recvStatus(ripple::TMStatusChange& packet); void recvStatus(ripple::TMStatusChange& packet);
void recvPropose(const boost::shared_ptr<ripple::TMProposeSet>& packet); void recvPropose(const boost::shared_ptr<ripple::TMProposeSet>& packet);