This reverts commit 1a2cc0acba6a66f89249455d8e5775849b56f755. Reason for revert: It breaks internal Android debug build. Need further investigation. Original change's description: > Reland "Replace the usage of MetricsObserverInterface by RTC_HISTOGRAM_*." > > This is a reland of 870bca1f418a1abf445169a638a61f9a649d557f > > Original change's description: > > Replace the usage of MetricsObserverInterface by RTC_HISTOGRAM_*. > > > > We now use RTC_HISTOGRAM_* macros in system_wrappers/include/metrics.h > > to report the metrics in pc/ and p2p/ that are currently been reported > > using MetricsObserverInterface. > > > > TBR=tommi@webrtc.org > > > > Bug: webrtc:9409 > > Change-Id: I47c9975402293c72250203fa1ec19eb1668766f6 > > Reviewed-on: https://webrtc-review.googlesource.com/83782 > > Commit-Queue: Qingsi Wang <qingsi@google.com> > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Reviewed-by: Taylor (left Google) <deadbeef@webrtc.org> > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#23914} > > TBR=steveanton@webrtc.org,hta@webrtc.org,tommi@webrtc.org > > Bug: webrtc:9409 > Change-Id: I37fc95ced60dea25aa9b4f5ad44bdf7174c8bd5c > Reviewed-on: https://webrtc-review.googlesource.com/88060 > Reviewed-by: Qingsi Wang <qingsi@webrtc.org> > Commit-Queue: Qingsi Wang <qingsi@google.com> > Cr-Commit-Position: refs/heads/master@{#23919} TBR=steveanton@webrtc.org,deadbeef@webrtc.org,tommi@webrtc.org,hta@webrtc.org,qingsi@google.com,qingsi@webrtc.org Change-Id: I4a75fc7f52bfd0780526537a5a9a016fb9c20d6a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9409 Reviewed-on: https://webrtc-review.googlesource.com/88320 Reviewed-by: Qingsi Wang <qingsi@webrtc.org> Commit-Queue: Qingsi Wang <qingsi@google.com> Cr-Commit-Position: refs/heads/master@{#23938}
88 lines
2.6 KiB
C++
88 lines
2.6 KiB
C++
/*
|
|
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include "api/fakemetricsobserver.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
FakeMetricsObserver::FakeMetricsObserver() {
|
|
Reset();
|
|
}
|
|
|
|
void FakeMetricsObserver::Reset() {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
counters_.clear();
|
|
memset(histogram_samples_, 0, sizeof(histogram_samples_));
|
|
}
|
|
|
|
void FakeMetricsObserver::IncrementEnumCounter(
|
|
PeerConnectionEnumCounterType type,
|
|
int counter,
|
|
int counter_max) {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
if (counters_.size() <= static_cast<size_t>(type)) {
|
|
counters_.resize(type + 1);
|
|
}
|
|
auto& counters = counters_[type];
|
|
++counters[counter];
|
|
}
|
|
|
|
void FakeMetricsObserver::AddHistogramSample(PeerConnectionMetricsName type,
|
|
int value) {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
RTC_DCHECK_EQ(histogram_samples_[type], 0);
|
|
histogram_samples_[type] = value;
|
|
}
|
|
|
|
int FakeMetricsObserver::GetEnumCounter(PeerConnectionEnumCounterType type,
|
|
int counter) const {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
if (counters_.size() <= static_cast<size_t>(type)) {
|
|
return 0;
|
|
}
|
|
const auto& it = counters_[type].find(counter);
|
|
if (it == counters_[type].end()) {
|
|
return 0;
|
|
}
|
|
return it->second;
|
|
}
|
|
|
|
int FakeMetricsObserver::GetHistogramSample(
|
|
PeerConnectionMetricsName type) const {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
return histogram_samples_[type];
|
|
}
|
|
|
|
bool FakeMetricsObserver::ExpectOnlySingleEnumCount(
|
|
PeerConnectionEnumCounterType type,
|
|
int counter) const {
|
|
RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
if (counters_.size() <= static_cast<size_t>(type)) {
|
|
// If a counter has not been allocated then there has been no call to
|
|
// |IncrementEnumCounter| so all the values are 0.
|
|
return false;
|
|
}
|
|
bool pass = true;
|
|
if (GetEnumCounter(type, counter) != 1) {
|
|
RTC_LOG(LS_ERROR) << "Expected single count for counter: " << counter;
|
|
pass = false;
|
|
}
|
|
for (const auto& entry : counters_[type]) {
|
|
if (entry.first != counter && entry.second > 0) {
|
|
RTC_LOG(LS_ERROR) << "Expected no count for counter: " << entry.first;
|
|
pass = false;
|
|
}
|
|
}
|
|
return pass;
|
|
}
|
|
|
|
} // namespace webrtc
|