2012-06-07 08:10:14 +00:00
|
|
|
/*
|
2013-12-03 10:31:59 +00:00
|
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
2012-06-07 08:10:14 +00:00
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
2016-02-23 22:49:42 -08:00
|
|
|
#include "webrtc/base/rate_statistics.h"
|
2012-06-07 08:10:14 +00:00
|
|
|
|
2016-04-22 15:48:23 +02:00
|
|
|
#include <algorithm>
|
|
|
|
|
|
|
|
|
|
#include "webrtc/base/checks.h"
|
2014-04-29 17:54:17 +00:00
|
|
|
|
2012-06-07 08:10:14 +00:00
|
|
|
namespace webrtc {
|
|
|
|
|
|
2013-12-03 10:31:59 +00:00
|
|
|
RateStatistics::RateStatistics(uint32_t window_size_ms, float scale)
|
|
|
|
|
: num_buckets_(window_size_ms + 1), // N ms in (N+1) buckets.
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
buckets_(new size_t[num_buckets_]()),
|
2013-12-03 10:31:59 +00:00
|
|
|
accumulated_count_(0),
|
2013-11-25 17:49:28 +00:00
|
|
|
oldest_time_(0),
|
|
|
|
|
oldest_index_(0),
|
2016-04-22 15:48:23 +02:00
|
|
|
scale_(scale) {}
|
2012-06-07 08:10:14 +00:00
|
|
|
|
2016-02-23 22:49:42 -08:00
|
|
|
RateStatistics::~RateStatistics() {}
|
2012-06-07 08:10:14 +00:00
|
|
|
|
2013-12-03 10:31:59 +00:00
|
|
|
void RateStatistics::Reset() {
|
|
|
|
|
accumulated_count_ = 0;
|
2013-11-25 17:49:28 +00:00
|
|
|
oldest_time_ = 0;
|
|
|
|
|
oldest_index_ = 0;
|
|
|
|
|
for (int i = 0; i < num_buckets_; i++) {
|
|
|
|
|
buckets_[i] = 0;
|
2013-04-18 12:25:32 +00:00
|
|
|
}
|
2012-06-07 08:10:14 +00:00
|
|
|
}
|
|
|
|
|
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
void RateStatistics::Update(size_t count, int64_t now_ms) {
|
2013-11-25 17:49:28 +00:00
|
|
|
if (now_ms < oldest_time_) {
|
|
|
|
|
// Too old data is ignored.
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EraseOld(now_ms);
|
|
|
|
|
|
|
|
|
|
int now_offset = static_cast<int>(now_ms - oldest_time_);
|
2016-04-22 15:48:23 +02:00
|
|
|
RTC_DCHECK_LT(now_offset, num_buckets_);
|
2013-11-25 17:49:28 +00:00
|
|
|
int index = oldest_index_ + now_offset;
|
|
|
|
|
if (index >= num_buckets_) {
|
|
|
|
|
index -= num_buckets_;
|
|
|
|
|
}
|
2013-12-03 10:31:59 +00:00
|
|
|
buckets_[index] += count;
|
|
|
|
|
accumulated_count_ += count;
|
2013-11-25 17:49:28 +00:00
|
|
|
}
|
|
|
|
|
|
2013-12-03 10:31:59 +00:00
|
|
|
uint32_t RateStatistics::Rate(int64_t now_ms) {
|
2013-04-18 12:25:32 +00:00
|
|
|
EraseOld(now_ms);
|
2016-04-22 15:48:23 +02:00
|
|
|
float scale = scale_ / (now_ms - oldest_time_ + 1);
|
|
|
|
|
return static_cast<uint32_t>(accumulated_count_ * scale + 0.5f);
|
2012-06-07 08:10:14 +00:00
|
|
|
}
|
|
|
|
|
|
2013-12-03 10:31:59 +00:00
|
|
|
void RateStatistics::EraseOld(int64_t now_ms) {
|
2013-11-25 17:49:28 +00:00
|
|
|
int64_t new_oldest_time = now_ms - num_buckets_ + 1;
|
|
|
|
|
if (new_oldest_time <= oldest_time_) {
|
2016-04-22 15:48:23 +02:00
|
|
|
if (accumulated_count_ == 0)
|
|
|
|
|
oldest_time_ = now_ms;
|
2013-11-25 17:49:28 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
while (oldest_time_ < new_oldest_time) {
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t count_in_oldest_bucket = buckets_[oldest_index_];
|
2016-04-22 15:48:23 +02:00
|
|
|
RTC_DCHECK_GE(accumulated_count_, count_in_oldest_bucket);
|
2013-12-03 10:31:59 +00:00
|
|
|
accumulated_count_ -= count_in_oldest_bucket;
|
2013-11-25 17:49:28 +00:00
|
|
|
buckets_[oldest_index_] = 0;
|
|
|
|
|
if (++oldest_index_ >= num_buckets_) {
|
|
|
|
|
oldest_index_ = 0;
|
|
|
|
|
}
|
|
|
|
|
++oldest_time_;
|
2013-12-03 10:31:59 +00:00
|
|
|
if (accumulated_count_ == 0) {
|
2013-11-25 17:49:28 +00:00
|
|
|
// This guarantees we go through all the buckets at most once, even if
|
|
|
|
|
// |new_oldest_time| is far greater than |oldest_time_|.
|
2016-04-22 15:48:23 +02:00
|
|
|
new_oldest_time = now_ms;
|
2013-04-18 12:25:32 +00:00
|
|
|
break;
|
2012-06-07 08:10:14 +00:00
|
|
|
}
|
2013-04-18 12:25:32 +00:00
|
|
|
}
|
2013-11-25 17:49:28 +00:00
|
|
|
oldest_time_ = new_oldest_time;
|
2012-06-07 08:10:14 +00:00
|
|
|
}
|
2013-12-03 10:31:59 +00:00
|
|
|
|
2012-06-07 08:10:14 +00:00
|
|
|
} // namespace webrtc
|