diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp index 0a130f90a..00a60898f 100644 --- a/src/cpp/ripple/LedgerMaster.cpp +++ b/src/cpp/ripple/LedgerMaster.cpp @@ -164,7 +164,7 @@ static bool shouldAcquire(uint32 currentLedger, uint32 ledgerHistory, uint32 can if (candidateLedger >= currentLedger) ret = true; else ret = (currentLedger - candidateLedger) <= ledgerHistory; - cLog(lsDEBUG) << "Missing ledger " << candidateLedger << (ret ? "will" : "will NOT") << " be acquired"; + cLog(lsDEBUG) << "Missing ledger " << candidateLedger << (ret ? " will" : " will NOT") << " be acquired"; return ret; } diff --git a/src/cpp/ripple/LoadMonitor.cpp b/src/cpp/ripple/LoadMonitor.cpp index cffb6fa8d..b014c330e 100644 --- a/src/cpp/ripple/LoadMonitor.cpp +++ b/src/cpp/ripple/LoadMonitor.cpp @@ -87,5 +87,5 @@ void LoadMonitor::getCountAndLatency(uint64& count, uint64& latencyAvg, uint64& latencyAvg = mLatencyMSAvg / (mLatencyEvents * 4); latencyPeak = mLatencyMSPeak / (mLatencyEvents * 4); } - isOver = isOverTarget(); + isOver = isOverTarget(latencyAvg, latencyPeak); } diff --git a/src/cpp/ripple/LoadMonitor.h b/src/cpp/ripple/LoadMonitor.h index 2f4219462..ba210b75c 100644 --- a/src/cpp/ripple/LoadMonitor.h +++ b/src/cpp/ripple/LoadMonitor.h @@ -35,14 +35,14 @@ public: void setTargetLatency(uint64 avg, uint64 pk) { - mTargetLatencyAvg = avg; - mTargetLatencyPk = pk; + mTargetLatencyAvg = avg * 4; + mTargetLatencyPk = pk * 4; } - bool isOverTarget() + bool isOverTarget(uint64 avg, uint64 peak) { - return (mTargetLatencyPk && (mLatencyMSPeak > mTargetLatencyPk)) || - (mTargetLatencyAvg && (mLatencyMSAvg > mTargetLatencyAvg)); + return (mTargetLatencyPk && (peak > mTargetLatencyPk)) || + (mTargetLatencyAvg && (avg > mTargetLatencyAvg)); } void getCountAndLatency(uint64& count, uint64& latencyAvg, uint64& latencyPeak, bool& isOver); diff --git a/src/cpp/ripple/TaggedCache.h b/src/cpp/ripple/TaggedCache.h index c8ee1d20e..1fbaae9ad 100644 --- a/src/cpp/ripple/TaggedCache.h +++ b/src/cpp/ripple/TaggedCache.h @@ -244,7 +244,7 @@ boost::shared_ptr TaggedCache::fetch(const key_type& key) template bool TaggedCache::store(const key_type& key, const c_Data& data) { - boost::shared_ptr d = boost::make_shared(boost::ref(data)); + boost::shared_ptr d = boost::make_shared(boost::cref(data)); return canonicalize(key, d); }