forked from JumpingYang001/webrtc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch CallStats to TQ interface + callbacks on the worker thread.
Bug: webrtc:11489 Change-Id: I08c4cd42dfa28d88ed9f0aa8c8b2cfb606bf00df Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174240 Commit-Queue: Tommi <[email protected]> Reviewed-by: Magnus Flodman <[email protected]> Cr-Commit-Position: refs/heads/master@{#31203}
- Loading branch information
Tommi
authored and
Commit Bot
committed
May 10, 2020
1 parent
674b0c8
commit 822a874
Showing
11 changed files
with
690 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| /* | ||
| * Copyright (c) 2020 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 "video/call_stats2.h" | ||
|
|
||
| #include <algorithm> | ||
| #include <memory> | ||
|
|
||
| #include "absl/algorithm/container.h" | ||
| #include "modules/utility/include/process_thread.h" | ||
| #include "rtc_base/checks.h" | ||
| #include "rtc_base/location.h" | ||
| #include "rtc_base/task_utils/to_queued_task.h" | ||
| #include "system_wrappers/include/metrics.h" | ||
|
|
||
| namespace webrtc { | ||
| namespace internal { | ||
| namespace { | ||
|
|
||
| void RemoveOldReports(int64_t now, std::list<CallStats::RttTime>* reports) { | ||
| static constexpr const int64_t kRttTimeoutMs = 1500; | ||
| reports->remove_if( | ||
| [&now](CallStats::RttTime& r) { return now - r.time > kRttTimeoutMs; }); | ||
| } | ||
|
|
||
| int64_t GetMaxRttMs(const std::list<CallStats::RttTime>& reports) { | ||
| int64_t max_rtt_ms = -1; | ||
| for (const CallStats::RttTime& rtt_time : reports) | ||
| max_rtt_ms = std::max(rtt_time.rtt, max_rtt_ms); | ||
| return max_rtt_ms; | ||
| } | ||
|
|
||
| int64_t GetAvgRttMs(const std::list<CallStats::RttTime>& reports) { | ||
| RTC_DCHECK(!reports.empty()); | ||
| int64_t sum = 0; | ||
| for (std::list<CallStats::RttTime>::const_iterator it = reports.begin(); | ||
| it != reports.end(); ++it) { | ||
| sum += it->rtt; | ||
| } | ||
| return sum / reports.size(); | ||
| } | ||
|
|
||
| int64_t GetNewAvgRttMs(const std::list<CallStats::RttTime>& reports, | ||
| int64_t prev_avg_rtt) { | ||
| if (reports.empty()) | ||
| return -1; // Reset (invalid average). | ||
|
|
||
| int64_t cur_rtt_ms = GetAvgRttMs(reports); | ||
| if (prev_avg_rtt == -1) | ||
| return cur_rtt_ms; // New initial average value. | ||
|
|
||
| // Weight factor to apply to the average rtt. | ||
| // We weigh the old average at 70% against the new average (30%). | ||
| constexpr const float kWeightFactor = 0.3f; | ||
| return prev_avg_rtt * (1.0f - kWeightFactor) + cur_rtt_ms * kWeightFactor; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| CallStats::CallStats(Clock* clock, TaskQueueBase* task_queue) | ||
| : clock_(clock), | ||
| last_process_time_(clock_->TimeInMilliseconds()), | ||
| max_rtt_ms_(-1), | ||
| avg_rtt_ms_(-1), | ||
| sum_avg_rtt_ms_(0), | ||
| num_avg_rtt_(0), | ||
| time_of_first_rtt_ms_(-1), | ||
| task_queue_(task_queue) { | ||
| RTC_DCHECK(task_queue_); | ||
| process_thread_checker_.Detach(); | ||
| task_queue_->PostDelayedTask( | ||
| ToQueuedTask(task_safety_flag_, [this]() { RunTimer(); }), | ||
| kUpdateIntervalMs); | ||
| } | ||
|
|
||
| CallStats::~CallStats() { | ||
| RTC_DCHECK_RUN_ON(&construction_thread_checker_); | ||
| RTC_DCHECK(observers_.empty()); | ||
|
|
||
| task_safety_flag_->SetNotAlive(); | ||
|
|
||
| UpdateHistograms(); | ||
| } | ||
|
|
||
| void CallStats::RunTimer() { | ||
| RTC_DCHECK_RUN_ON(&construction_thread_checker_); | ||
|
|
||
| UpdateAndReport(); | ||
|
|
||
| uint32_t interval = | ||
| last_process_time_ + kUpdateIntervalMs - clock_->TimeInMilliseconds(); | ||
|
|
||
| task_queue_->PostDelayedTask( | ||
| ToQueuedTask(task_safety_flag_, [this]() { RunTimer(); }), interval); | ||
| } | ||
|
|
||
| void CallStats::UpdateAndReport() { | ||
| RTC_DCHECK_RUN_ON(&construction_thread_checker_); | ||
|
|
||
| int64_t now = clock_->TimeInMilliseconds(); | ||
| last_process_time_ = now; | ||
|
|
||
| // |avg_rtt_ms_| is allowed to be read on the construction thread since that's | ||
| // the only thread that modifies the value. | ||
| int64_t avg_rtt_ms = avg_rtt_ms_; | ||
| RemoveOldReports(now, &reports_); | ||
| max_rtt_ms_ = GetMaxRttMs(reports_); | ||
| avg_rtt_ms = GetNewAvgRttMs(reports_, avg_rtt_ms); | ||
| { | ||
| rtc::CritScope lock(&avg_rtt_ms_lock_); | ||
| avg_rtt_ms_ = avg_rtt_ms; | ||
| } | ||
|
|
||
| // If there is a valid rtt, update all observers with the max rtt. | ||
| if (max_rtt_ms_ >= 0) { | ||
| RTC_DCHECK_GE(avg_rtt_ms, 0); | ||
| for (CallStatsObserver* observer : observers_) | ||
| observer->OnRttUpdate(avg_rtt_ms, max_rtt_ms_); | ||
| // Sum for Histogram of average RTT reported over the entire call. | ||
| sum_avg_rtt_ms_ += avg_rtt_ms; | ||
| ++num_avg_rtt_; | ||
| } | ||
| } | ||
|
|
||
| void CallStats::RegisterStatsObserver(CallStatsObserver* observer) { | ||
| RTC_DCHECK_RUN_ON(&construction_thread_checker_); | ||
| if (!absl::c_linear_search(observers_, observer)) | ||
| observers_.push_back(observer); | ||
| } | ||
|
|
||
| void CallStats::DeregisterStatsObserver(CallStatsObserver* observer) { | ||
| RTC_DCHECK_RUN_ON(&construction_thread_checker_); | ||
| observers_.remove(observer); | ||
| } | ||
|
|
||
| int64_t CallStats::LastProcessedRtt() const { | ||
| RTC_DCHECK_RUN_ON(&construction_thread_checker_); | ||
| // No need for locking since we're on the construction thread. | ||
| return avg_rtt_ms_; | ||
| } | ||
|
|
||
| int64_t CallStats::LastProcessedRttFromProcessThread() const { | ||
| RTC_DCHECK_RUN_ON(&process_thread_checker_); | ||
| rtc::CritScope lock(&avg_rtt_ms_lock_); | ||
| return avg_rtt_ms_; | ||
| } | ||
|
|
||
| void CallStats::OnRttUpdate(int64_t rtt) { | ||
| RTC_DCHECK_RUN_ON(&process_thread_checker_); | ||
|
|
||
| int64_t now_ms = clock_->TimeInMilliseconds(); | ||
| task_queue_->PostTask(ToQueuedTask(task_safety_flag_, [this, rtt, now_ms]() { | ||
| RTC_DCHECK_RUN_ON(&construction_thread_checker_); | ||
| reports_.push_back(RttTime(rtt, now_ms)); | ||
| if (time_of_first_rtt_ms_ == -1) | ||
| time_of_first_rtt_ms_ = now_ms; | ||
| UpdateAndReport(); | ||
| })); | ||
| } | ||
|
|
||
| void CallStats::UpdateHistograms() { | ||
| RTC_DCHECK_RUN_ON(&construction_thread_checker_); | ||
|
|
||
| if (time_of_first_rtt_ms_ == -1 || num_avg_rtt_ < 1) | ||
| return; | ||
|
|
||
| int64_t elapsed_sec = | ||
| (clock_->TimeInMilliseconds() - time_of_first_rtt_ms_) / 1000; | ||
| if (elapsed_sec >= metrics::kMinRunTimeInSeconds) { | ||
| int64_t avg_rtt_ms = (sum_avg_rtt_ms_ + num_avg_rtt_ / 2) / num_avg_rtt_; | ||
| RTC_HISTOGRAM_COUNTS_10000( | ||
| "WebRTC.Video.AverageRoundTripTimeInMilliseconds", avg_rtt_ms); | ||
| } | ||
| } | ||
|
|
||
| } // namespace internal | ||
| } // namespace webrtc |
Oops, something went wrong.