Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: remoting/base/rate_counter.cc

Issue 12803008: Add unit tests for sub-components of CaptureScheduler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pick nits. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/base/rate_counter.h ('k') | remoting/base/rate_counter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/rate_counter.cc
diff --git a/remoting/base/rate_counter.cc b/remoting/base/rate_counter.cc
index fff9b6cebcd18f3734cf7e5c9ed1c925b36fc1a4..e6532da165541fb06c21cee39032572cf7b8627e 100644
--- a/remoting/base/rate_counter.cc
+++ b/remoting/base/rate_counter.cc
@@ -4,36 +4,43 @@
#include "remoting/base/rate_counter.h"
+#include "base/logging.h"
+
namespace remoting {
RateCounter::RateCounter(base::TimeDelta time_window)
: time_window_(time_window),
sum_(0) {
+ DCHECK_GT(time_window.InMilliseconds(), 0);
}
RateCounter::~RateCounter() {
}
void RateCounter::Record(int64 value) {
- base::Time current_time = base::Time::Now();
- Evict(current_time);
+ DCHECK(CalledOnValidThread());
- base::AutoLock auto_lock(lock_);
+ base::Time current_time = CurrentTime();
+ EvictOldDataPoints(current_time);
sum_ += value;
data_points_.push(std::make_pair(current_time, value));
}
double RateCounter::Rate() {
- Evict(base::Time::Now());
+ DCHECK(CalledOnValidThread());
- base::AutoLock auto_lock(lock_);
- return static_cast<double>(base::Time::kMillisecondsPerSecond) * sum_ /
- time_window_.InMilliseconds();
+ EvictOldDataPoints(CurrentTime());
+ return sum_ / time_window_.InSecondsF();
}
-void RateCounter::Evict(base::Time current_time) {
- base::AutoLock auto_lock(lock_);
+void RateCounter::SetCurrentTimeForTest(base::Time current_time) {
+ DCHECK(CalledOnValidThread());
+ DCHECK(current_time >= current_time_for_test_);
+
+ current_time_for_test_ = current_time;
+}
+void RateCounter::EvictOldDataPoints(base::Time current_time) {
// Remove data points outside of the window.
base::Time window_start = current_time - time_window_;
@@ -46,4 +53,10 @@ void RateCounter::Evict(base::Time current_time) {
}
}
+base::Time RateCounter::CurrentTime() const {
+ if (current_time_for_test_ == base::Time())
+ return base::Time::Now();
+ return current_time_for_test_;
+}
+
} // namespace remoting
« no previous file with comments | « remoting/base/rate_counter.h ('k') | remoting/base/rate_counter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698