From 6f5f51de8a852b4bb758e099d8e79527454e2f71 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 6 Dec 2012 03:39:23 -0800 Subject: [PATCH 1/4] Use cref instead of ref. --- src/cpp/ripple/TaggedCache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } From 5376c01edb26ad1f0a508c4f2d580898d4d48db9 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 6 Dec 2012 03:44:33 -0800 Subject: [PATCH 2/4] Cosmetic fix --- src/cpp/ripple/LedgerMaster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From f99e2293dbdd35a171795d0e6be5d649bbe30bcb Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 6 Dec 2012 03:56:59 -0800 Subject: [PATCH 3/4] Don't erroneously report load over targets. --- src/cpp/ripple/LoadMonitor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp/ripple/LoadMonitor.h b/src/cpp/ripple/LoadMonitor.h index 2f4219462..33c078d0f 100644 --- a/src/cpp/ripple/LoadMonitor.h +++ b/src/cpp/ripple/LoadMonitor.h @@ -35,8 +35,8 @@ public: void setTargetLatency(uint64 avg, uint64 pk) { - mTargetLatencyAvg = avg; - mTargetLatencyPk = pk; + mTargetLatencyAvg = avg * 4; + mTargetLatencyPk = pk * 4; } bool isOverTarget() From 58e47d3f51cc405159b8b565b9654a6d0b1a3776 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 6 Dec 2012 04:17:51 -0800 Subject: [PATCH 4/4] get it right this time. --- src/cpp/ripple/LoadMonitor.cpp | 2 +- src/cpp/ripple/LoadMonitor.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 33c078d0f..ba210b75c 100644 --- a/src/cpp/ripple/LoadMonitor.h +++ b/src/cpp/ripple/LoadMonitor.h @@ -39,10 +39,10 @@ public: 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);