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

Unified Diff: chrome/browser/devtools/devtools_network_controller.cc

Issue 324953002: DevToolsNetworkController: support "limit throughput" network condition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more divide-by-zero check Created 6 years, 6 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
Index: chrome/browser/devtools/devtools_network_controller.cc
diff --git a/chrome/browser/devtools/devtools_network_controller.cc b/chrome/browser/devtools/devtools_network_controller.cc
index 362dc467fe645c4b010b55f2cdf8779671135647..0e3fff9e8148fcdbde192db54d96b4d36cbe4460 100644
--- a/chrome/browser/devtools/devtools_network_controller.cc
+++ b/chrome/browser/devtools/devtools_network_controller.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/devtools/devtools_network_controller.h"
+#include "base/time/time.h"
#include "chrome/browser/devtools/devtools_network_conditions.h"
#include "chrome/browser/devtools/devtools_network_transaction.h"
#include "chrome/browser/profiles/profile.h"
@@ -17,6 +18,13 @@ namespace {
const char kDevToolsRequestInitiator[] = "X-DevTools-Request-Initiator";
+struct Throttle {
+ DevToolsNetworkTransaction* transaction;
+ int64_t penalty;
vsevik 2014/06/11 12:08:51 Rename to bytes_left or pending_bytes_count?
vsevik 2014/06/11 12:08:51 Looks like we can encapsulate penalty into transac
eustas 2014/06/11 13:18:48 Done.
eustas 2014/06/11 13:18:48 Done.
+};
+
+int64_t kPacketSize = 1500;
+
} // namespace
DevToolsNetworkController::DevToolsNetworkController()
@@ -37,10 +45,15 @@ void DevToolsNetworkController::RemoveTransaction(
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(transactions_.find(transaction) != transactions_.end());
transactions_.erase(transaction);
+
+ size_t length = throttles_.size();
+ for (size_t i = 0; i < length; ++i) {
+ if (throttles_[i].transaction == transaction)
+ throttles_[i].transaction = NULL;
+ }
}
void DevToolsNetworkController::SetNetworkState(
- const std::string& client_id,
const scoped_refptr<DevToolsNetworkConditions> conditions) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
BrowserThread::PostTask(
@@ -49,35 +62,49 @@ void DevToolsNetworkController::SetNetworkState(
base::Bind(
&DevToolsNetworkController::SetNetworkStateOnIO,
weak_ptr_factory_.GetWeakPtr(),
- client_id,
conditions));
}
void DevToolsNetworkController::SetNetworkStateOnIO(
- const std::string& client_id,
const scoped_refptr<DevToolsNetworkConditions> conditions) {
DCHECK(thread_checker_.CalledOnValidThread());
- if (!conditions) {
- if (client_id == active_client_id_) {
- conditions_ = NULL;
- active_client_id_ = std::string();
- }
+ if (conditions_ && conditions_->IsThrottling())
+ UpdateThrottles();
+
+ conditions_ = conditions;
+ if (!conditions || !conditions->IsThrottling())
+ CancelThrottles();
+ if (!conditions)
return;
+
+ FireThrottledCallbacks();
vsevik 2014/06/11 12:08:51 We should only do this in case we are continuing t
eustas 2014/06/11 13:18:48 Done.
+
+ if (conditions_->IsOffline()) {
+ // Iterate over a copy of set, because failing of transaction could
+ // result in creating a new one, or (theoretically) destroying one.
+ Transactions old_transactions(transactions_);
+ for (Transactions::iterator it = old_transactions.begin();
+ it != old_transactions.end(); ++it) {
+ if (transactions_.find(*it) == transactions_.end())
+ continue;
+ if (!(*it)->request() || (*it)->failed())
+ continue;
+ if (ShouldFail((*it)->request()))
+ (*it)->Fail();
+ }
}
- conditions_ = conditions;
- active_client_id_ = client_id;
-
- // Iterate over a copy of set, because failing of transaction could result in
- // creating a new one, or (theoretically) destroying one.
- Transactions old_transactions(transactions_);
- for (Transactions::iterator it = old_transactions.begin();
- it != old_transactions.end(); ++it) {
- if (transactions_.find(*it) == transactions_.end())
- continue;
- if (!(*it)->request() || (*it)->failed())
- continue;
- if (ShouldFail((*it)->request()))
- (*it)->Fail();
+
+ if (conditions_->IsThrottling()) {
+ DCHECK(conditions_->maximal_throughput() != 0);
+ offset_ = base::TimeTicks::Now();
+ last_tick_ = 0;
+ int64_t us_tick_length =
+ (1000000L * kPacketSize) / conditions_->maximal_throughput();
+ DCHECK(us_tick_length != 0);
+ if (us_tick_length == 0)
+ us_tick_length = 1;
+ tick_length_ = base::TimeDelta::FromMicroseconds(us_tick_length);
+ ArmTimer();
}
}
@@ -93,3 +120,109 @@ bool DevToolsNetworkController::ShouldFail(
return !request->extra_headers.HasHeader(kDevToolsRequestInitiator);
}
+
+bool DevToolsNetworkController::ShouldThrottle(
+ const net::HttpRequestInfo* request) {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ DCHECK(request);
+ if (!conditions_ || !conditions_->IsThrottling())
+ return false;
+
+ if (!conditions_->HasMatchingDomain(request->url))
+ return false;
+
+ return !request->extra_headers.HasHeader(kDevToolsRequestInitiator);
+}
+
+void DevToolsNetworkController::UpdateThrottles() {
+ int64_t last_tick = (base::TimeTicks::Now() - offset_) / tick_length_;
+ int64_t ticks = last_tick - last_tick_;
+ last_tick_ = last_tick;
+
+ int64_t length = throttles_.size();
+ if (!length)
+ return;
+
+ int64_t delta = (ticks / length) * kPacketSize;
+ int64_t shift = ticks % length;
vsevik 2014/06/11 12:08:51 nit: What is delta and what is shift? Could you pl
+ for (int64_t i = 0; i < length; ++i)
+ throttles_[i].penalty -= delta + (i < shift ? kPacketSize : 0);
+ std::rotate(
+ throttles_.begin(), throttles_.begin() + shift, throttles_.end());
+}
+
+void DevToolsNetworkController::CancelThrottles() {
+ timer_.Stop();
+
+ int64_t length = throttles_.size();
+ if (!length)
+ return;
+
+ Throttles throttles;
+ throttles_.swap(throttles);
+ for (int64_t i = 0; i < length; ++i) {
+ DevToolsNetworkTransaction* transaction = throttles[i].transaction;
vsevik 2014/06/11 12:08:51 I am pretty sure transaction is never null here, o
eustas 2014/06/11 13:18:48 Done.
+ if (transaction)
+ transaction->FireThrottledCallback();
+ }
+}
+
+void DevToolsNetworkController::FireThrottledCallbacks() {
+ size_t length = throttles_.size();
+ if (!length)
+ return;
+
+ Throttles active;
vsevik 2014/06/11 12:08:51 nit: active_transactions
eustas 2014/06/11 13:18:48 Done.
+ Throttles finished;
vsevik 2014/06/11 12:08:51 ditto
eustas 2014/06/11 13:18:48 Done.
+ for (size_t i = 0; i < length; ++i) {
+ if (throttles_[i].penalty <= 0)
+ finished.push_back(throttles_[i]);
+ else
+ active.push_back(throttles_[i]);
+ }
+ throttles_.swap(active);
+
+ length = finished.size();
+ for (size_t i = 0; i < length; ++i) {
+ DevToolsNetworkTransaction* transaction = finished[i].transaction;
+ if (transaction)
+ transaction->FireThrottledCallback();
+ }
+}
+
+void DevToolsNetworkController::OnTimer() {
+ UpdateThrottles();
+ FireThrottledCallbacks();
+ ArmTimer();
+}
+
+void DevToolsNetworkController::ArmTimer() {
+ size_t length = throttles_.size();
+ if (!length)
+ return;
+ int64_t min_ticks_left;
+ for (size_t i = 0; i < length; ++i) {
+ int64_t packets_left =
+ (throttles_[i].penalty + kPacketSize - 1) / kPacketSize;
+ int64_t ticks_left = (i + 1) + length * (packets_left - 1);
+ if (i == 0 || ticks_left < min_ticks_left)
+ min_ticks_left = ticks_left;
+ }
+ base::TimeTicks desired_time =
+ offset_ + tick_length_ * (last_tick_ + min_ticks_left);
+ timer_.Start(
+ FROM_HERE,
+ desired_time - base::TimeTicks::Now(),
+ base::Bind(
+ &DevToolsNetworkController::OnTimer,
+ weak_ptr_factory_.GetWeakPtr()));
+}
+
+void DevToolsNetworkController::ThrottleTransaction(
+ DevToolsNetworkTransaction* transaction,
+ int64_t penalty) {
+ UpdateThrottles();
+ throttles_.push_back({transaction, penalty});
+ FireThrottledCallbacks();
+ ArmTimer();
+}

Powered by Google App Engine
This is Rietveld 408576698