ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure all fee schedule changes are reported to clients.

Browse Source
This commit is contained in:
JoelKatz
2013-02-11 14:50:15 -08:00
parent 4261b1c2d0
commit d0e85ff4b4
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/cpp/ripple/LoadManager.cpp
View File

@@ -242,7 +242,7 @@ void LoadFeeTrack::setRemoteFee(uint32 f)
mRemoteTxnLoadFee = f; mRemoteTxnLoadFee = f;
} }
void LoadFeeTrack::raiseLocalFee() bool LoadFeeTrack::raiseLocalFee()
{ {
boost::mutex::scoped_lock sl(mLock); boost::mutex::scoped_lock sl(mLock);
uint32 origFee = mLocalTxnLoadFee; uint32 origFee = mLocalTxnLoadFee;
@@ -255,11 +255,13 @@ void LoadFeeTrack::raiseLocalFee()
if (mLocalTxnLoadFee > lftFeeMax) if (mLocalTxnLoadFee > lftFeeMax)
mLocalTxnLoadFee = lftFeeMax; mLocalTxnLoadFee = lftFeeMax;
tLog(origFee != mLocalTxnLoadFee, lsDEBUG) << if (origFee == mLocalTxnLoadFee)
"Local load fee raised from " << origFee << " to " << mLocalTxnLoadFee; return false;
cLog(lsDEBUG) << "Local load fee raised from " << origFee << " to " << mLocalTxnLoadFee;
return true;
} }
void LoadFeeTrack::lowerLocalFee() bool LoadFeeTrack::lowerLocalFee()
{ {
boost::mutex::scoped_lock sl(mLock); boost::mutex::scoped_lock sl(mLock);
uint32 origFee = mLocalTxnLoadFee; uint32 origFee = mLocalTxnLoadFee;
@@ -269,8 +271,10 @@ void LoadFeeTrack::lowerLocalFee()
if (mLocalTxnLoadFee < lftNormalFee) if (mLocalTxnLoadFee < lftNormalFee)
mLocalTxnLoadFee = lftNormalFee; mLocalTxnLoadFee = lftNormalFee;
tLog(origFee != mLocalTxnLoadFee, lsDEBUG) << if (origFee == mLocalTxnLoadFee)
"Local load fee lowered from " << origFee << " to " << mLocalTxnLoadFee; return false;
cLog(lsDEBUG) << "Local load fee lowered from " << origFee << " to " << mLocalTxnLoadFee;
return true;
} }
Json::Value LoadFeeTrack::getJson(uint64 baseFee, uint32 referenceFeeUnits) Json::Value LoadFeeTrack::getJson(uint64 baseFee, uint32 referenceFeeUnits)
@@ -312,10 +316,13 @@ void LoadManager::threadEntry()
++mUptime; ++mUptime;
} }
bool change;
if (theApp->getJobQueue().isOverloaded()) if (theApp->getJobQueue().isOverloaded())
theApp->getFeeTrack().raiseLocalFee(); change = theApp->getFeeTrack().raiseLocalFee();
else else
theApp->getFeeTrack().lowerLocalFee(); change = theApp->getFeeTrack().lowerLocalFee();
if (change)
theApp->getOPs().reportFeeChange();
t += boost::posix_time::seconds(1); t += boost::posix_time::seconds(1);
boost::posix_time::time_duration when = t - boost::posix_time::microsec_clock::universal_time(); boost::posix_time::time_duration when = t - boost::posix_time::microsec_clock::universal_time();

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

@@ -164,8 +164,8 @@ public:
Json::Value getJson(uint64 baseFee, uint32 referenceFeeUnits); Json::Value getJson(uint64 baseFee, uint32 referenceFeeUnits);
void setRemoteFee(uint32); void setRemoteFee(uint32);
void raiseLocalFee(); bool raiseLocalFee();
void lowerLocalFee(); bool lowerLocalFee();
}; };

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

@@ -35,7 +35,8 @@ void InfoSub::onSendEmpty()
NetworkOPs::NetworkOPs(boost::asio::io_service& io_service, LedgerMaster* pLedgerMaster) : NetworkOPs::NetworkOPs(boost::asio::io_service& io_service, LedgerMaster* pLedgerMaster) :
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),
mLastLoadBase(256), mLastLoadFactor(256)
{ {
} }
@@ -1020,8 +1021,8 @@ void NetworkOPs::pubServer()
jvObj["type"] = "serverStatus"; jvObj["type"] = "serverStatus";
jvObj["server_status"] = strOperatingMode(); jvObj["server_status"] = strOperatingMode();
jvObj["load_base"] = theApp->getFeeTrack().getLoadBase(); jvObj["load_base"] = (mLastLoadBase = theApp->getFeeTrack().getLoadBase());
jvObj["load_factor"] = theApp->getFeeTrack().getLoadFactor(); jvObj["load_factor"] = (mLastLoadFactor = theApp->getFeeTrack().getLoadFactor());
BOOST_FOREACH(InfoSub* ispListener, mSubServer) BOOST_FOREACH(InfoSub* ispListener, mSubServer)
{ {
@@ -1285,6 +1286,15 @@ void NetworkOPs::pubLedger(Ledger::ref lpAccepted)
} }
} }
void NetworkOPs::reportFeeChange()
{
if ((theApp->getFeeTrack().getLoadBase() == mLastLoadBase) &&
(theApp->getFeeTrack().getLoadFactor() == mLastLoadFactor))
return;
theApp->getJobQueue().addJob(jtCLIENT, boost::bind(&NetworkOPs::pubServer, this));
}
Json::Value NetworkOPs::transJson(const SerializedTransaction& stTxn, TER terResult, bool bAccepted, Ledger::ref lpCurrent, const std::string& strType) Json::Value NetworkOPs::transJson(const SerializedTransaction& stTxn, TER terResult, bool bAccepted, Ledger::ref lpCurrent, const std::string& strType)
{ {
Json::Value jvObj(Json::objectValue); Json::Value jvObj(Json::objectValue);

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

@@ -116,6 +116,9 @@ protected:
boost::recursive_mutex mWantedHashLock; boost::recursive_mutex mWantedHashLock;
boost::unordered_set<uint256> mWantedHashes; boost::unordered_set<uint256> mWantedHashes;
uint32 mLastLoadBase;
uint32 mLastLoadFactor;
void setMode(OperatingMode); void setMode(OperatingMode);
Json::Value transJson(const SerializedTransaction& stTxn, TER terResult, bool bAccepted, Ledger::ref lpCurrent, const std::string& strType); Json::Value transJson(const SerializedTransaction& stTxn, TER terResult, bool bAccepted, Ledger::ref lpCurrent, const std::string& strType);
@@ -257,6 +260,7 @@ public:
std::list<LedgerProposal::pointer> >& peekStoredProposals() { return mStoredProposals; } std::list<LedgerProposal::pointer> >& peekStoredProposals() { return mStoredProposals; }
void storeProposal(LedgerProposal::ref proposal, const RippleAddress& peerPublic); void storeProposal(LedgerProposal::ref proposal, const RippleAddress& peerPublic);
uint256 getConsensusLCL(); uint256 getConsensusLCL();
void reportFeeChange();
bool addWantedHash(const uint256& h); bool addWantedHash(const uint256& h);
bool isWantedHash(const uint256& h, bool remove); bool isWantedHash(const uint256& h, bool remove);