From 58e47d3f51cc405159b8b565b9654a6d0b1a3776 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 6 Dec 2012 04:17:51 -0800 Subject: [PATCH] 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 cffb6fa8da..b014c330ec 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 33c078d0fa..ba210b75c3 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);