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

Cleanups.

Browse Source
This commit is contained in:
JoelKatz
2013-04-22 15:17:23 -07:00
parent 12d86c6a47
commit df32873321
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cpp/ripple/LoadManager.h
View File

@@ -182,6 +182,7 @@ public:
void setRemoteFee(uint32); void setRemoteFee(uint32);
bool raiseLocalFee(); bool raiseLocalFee();
bool lowerLocalFee(); bool lowerLocalFee();
bool isLoaded() { return (raiseCount != 0) || (mLocalTxnLoadFee != lftNormalFee); }
}; };

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

@@ -36,7 +36,7 @@ NetworkOPs::NetworkOPs(boost::asio::io_service& io_service, LedgerMaster* pLedge
mMode(omDISCONNECTED), mNeedNetworkLedger(false), mProposing(false), mValidating(false), mMode(omDISCONNECTED), mNeedNetworkLedger(false), mProposing(false), mValidating(false),
mNetTimer(io_service), mLedgerMaster(pLedgerMaster), mCloseTimeOffset(0), mLastCloseProposers(0), mNetTimer(io_service), mLedgerMaster(pLedgerMaster), mCloseTimeOffset(0), mLastCloseProposers(0),
mLastCloseConvergeTime(1000 * LEDGER_IDLE_INTERVAL), mLastValidationTime(0), mLastCloseConvergeTime(1000 * LEDGER_IDLE_INTERVAL), mLastValidationTime(0),
mFetchPack("FetchPack", 2048, 3), mLastFetchPack(0), mFetchPack("FetchPack", 2048, 30), mLastFetchPack(0),
mLastLoadBase(256), mLastLoadFactor(256) mLastLoadBase(256), mLastLoadFactor(256)
{ {
} }
@@ -2051,7 +2051,7 @@ void NetworkOPs::makeFetchPack(Job&, boost::weak_ptr<Peer> wPeer, boost::shared_
newObj.set_ledgerseq(lSeq); newObj.set_ledgerseq(lSeq);
} }
} }
if (reply.objects().size() >= 768) if (reply.objects().size() >= 512)
break; break;
haveLedger = wantLedger; haveLedger = wantLedger;
wantLedger = getLedgerByHash(haveLedger->getParentHash()); wantLedger = getLedgerByHash(haveLedger->getParentHash());

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

@@ -1249,13 +1249,13 @@ void Peer::recvGetObjectByHash(const boost::shared_ptr<ripple::TMGetObjectByHash
{ {
if (obj.ledgerseq() != pLSeq) if (obj.ledgerseq() != pLSeq)
{ {
tLog(pLDo && (pLSeq != 0), lsDEBUG) << "Recevied full fetch pack for " << pLSeq;
pLSeq = obj.ledgerseq(); pLSeq = obj.ledgerseq();
pLDo = !theApp->getOPs().haveLedger(pLSeq); pLDo = !theApp->getOPs().haveLedger(pLSeq);
if (!pLDo) if (!pLDo)
{ {
cLog(lsDEBUG) << "Got pack for " << pLSeq << " too late"; cLog(lsDEBUG) << "Got pack for " << pLSeq << " too late";
} }
else cLog(lsDEBUG) << "Got pack for " << pLSeq;
} }
} }
@@ -1271,6 +1271,7 @@ void Peer::recvGetObjectByHash(const boost::shared_ptr<ripple::TMGetObjectByHash
} }
} }
} }
tLog(pLDo && (pLSeq != 0), lsDEBUG) << "Received partial fetch pack for " << pLSeq;
} }
} }
@@ -1864,8 +1865,11 @@ void Peer::doProofOfWork(Job&, boost::weak_ptr<Peer> peer, ProofOfWork::pointer
void Peer::doFetchPack(const boost::shared_ptr<ripple::TMGetObjectByHash>& packet) void Peer::doFetchPack(const boost::shared_ptr<ripple::TMGetObjectByHash>& packet)
{ {
if (packet->query()) if (theApp->getFeeTrack().isLoaded())
{ {
cLog(lsINFO) << "Too busy to make fetch pack";
return;
}
if (packet->ledgerhash().size() != 32) if (packet->ledgerhash().size() != 32)
{ {
cLog(lsWARNING) << "FetchPack hash size malformed"; cLog(lsWARNING) << "FetchPack hash size malformed";
@@ -1899,11 +1903,6 @@ void Peer::doFetchPack(const boost::shared_ptr<ripple::TMGetObjectByHash>& packe
theApp->getJobQueue().addJob(jtPACK, "MakeFetchPack", theApp->getJobQueue().addJob(jtPACK, "MakeFetchPack",
BIND_TYPE(&NetworkOPs::makeFetchPack, &theApp->getOPs(), P_1, BIND_TYPE(&NetworkOPs::makeFetchPack, &theApp->getOPs(), P_1,
boost::weak_ptr<Peer>(shared_from_this()), packet, wantLedger, haveLedger)); boost::weak_ptr<Peer>(shared_from_this()), packet, wantLedger, haveLedger));
}
else
{ // received fetch pack
// WRITEME
}
} }
bool Peer::hasProto(int version) bool Peer::hasProto(int version)