From 7db3bb95dc9819ab8ed6e08458df110b01d97119 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Mon, 25 Mar 2019 10:17:00 +0100 Subject: [PATCH] Revert "Remove rtc::TimeMillis() call from ALR detector." This reverts commit 2c7964832eacfddceb467da385c0dfe89a5b8d7d. NOTE: Build file changes had to be manually reverted to avoid merge conflict. Reason for revert: Bad interaction with Chromium issue. Original change's description: > Remove rtc::TimeMillis() call from ALR detector. > > We want to avoid system clock dependencies in congestion > controllers as it makes it harder to test them. This CL removes > a rtc::TimeMillis() call from the AlrDetector class and removes > dependencies on rtc_base_approved as it exposes time_utils.h. > > Bug: None > Change-Id: Ie50a27399c05a0c50cdc17ad142db884b94ee918 > Reviewed-on: https://webrtc-review.googlesource.com/c/124491 > Reviewed-by: Mirko Bonadei > Reviewed-by: Christoffer Rodbro > Commit-Queue: Sebastian Jansson > Cr-Commit-Position: refs/heads/master@{#26879} # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:942752 Change-Id: I7fc4391f16779ebb5d3c72a058fc72a3e4c64bce Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129440 Reviewed-by: Jonas Olsson Reviewed-by: Sebastian Jansson Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#27267} --- modules/congestion_controller/goog_cc/BUILD.gn | 1 + modules/congestion_controller/goog_cc/alr_detector.cc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn index 161cb3b94d..5d744ada33 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -94,6 +94,7 @@ rtc_source_set("alr_detector") { "../../../logging:rtc_event_pacing", "../../../rtc_base:checks", "../../../rtc_base:safe_conversions", + "../../../rtc_base:timeutils", "../../../rtc_base/experiments:alr_experiment", "../../pacing:interval_budget", "//third_party/abseil-cpp/absl/memory", diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc index 9ff40779a1..3009de44fd 100644 --- a/modules/congestion_controller/goog_cc/alr_detector.cc +++ b/modules/congestion_controller/goog_cc/alr_detector.cc @@ -20,6 +20,7 @@ #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" #include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/time_utils.h" namespace webrtc { AlrDetector::AlrDetector() : AlrDetector(nullptr) {} @@ -64,7 +65,7 @@ void AlrDetector::OnBytesSent(size_t bytes_sent, int64_t send_time_ms) { bool state_changed = false; if (alr_budget_.budget_level_percent() > alr_start_budget_level_percent_ && !alr_started_time_ms_) { - alr_started_time_ms_.emplace(send_time_ms); + alr_started_time_ms_.emplace(rtc::TimeMillis()); state_changed = true; } else if (alr_budget_.budget_level_percent() < alr_stop_budget_level_percent_ &&