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

Unified Diff: net/quic/quic_connection.cc

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « net/quic/quic_connection.h ('k') | net/quic/quic_connection_stats.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index 21ea41a99410f3a8efbf9384910e0cd87b46af6f..6308d884ce75b8dfda594dc61c1c633d1d2a8294 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -1139,13 +1139,11 @@ void QuicConnection::SendBlocked(QuicStreamId id) {
const QuicConnectionStats& QuicConnection::GetStats() {
// Update rtt and estimated bandwidth.
stats_.min_rtt_us =
- sent_packet_manager_.GetRttStats()->MinRtt().ToMicroseconds();
+ sent_packet_manager_.GetRttStats()->min_rtt().ToMicroseconds();
stats_.srtt_us =
- sent_packet_manager_.GetRttStats()->SmoothedRtt().ToMicroseconds();
+ sent_packet_manager_.GetRttStats()->smoothed_rtt().ToMicroseconds();
stats_.estimated_bandwidth =
sent_packet_manager_.BandwidthEstimate().ToBytesPerSecond();
- stats_.congestion_window = sent_packet_manager_.GetCongestionWindow();
- stats_.slow_start_threshold = sent_packet_manager_.GetSlowStartThreshold();
stats_.max_packet_size = packet_generator_.max_packet_length();
return stats_;
}
@@ -1276,7 +1274,7 @@ bool QuicConnection::ProcessValidatedPacket() {
if (is_server_ && encryption_level_ == ENCRYPTION_NONE &&
last_size_ > packet_generator_.max_packet_length()) {
- packet_generator_.set_max_packet_length(last_size_);
+ set_max_packet_length(last_size_);
}
return true;
}
@@ -1496,7 +1494,7 @@ bool QuicConnection::WritePacketInner(QueuedPacket* packet) {
// perhaps via the NetworkChangeVisitor.
packet_generator_.UpdateSequenceNumberLength(
sent_packet_manager_.least_packet_awaited_by_peer(),
- sent_packet_manager_.GetCongestionWindow());
+ sent_packet_manager_.EstimateMaxPacketsInFlight(max_packet_length()));
bool reset_retransmission_alarm = sent_packet_manager_.OnPacketSent(
&packet->serialized_packet,
@@ -1586,7 +1584,7 @@ void QuicConnection::OnSerializedPacket(
void QuicConnection::OnCongestionWindowChange() {
packet_generator_.OnCongestionWindowChange(
- sent_packet_manager_.GetCongestionWindow());
+ sent_packet_manager_.EstimateMaxPacketsInFlight(max_packet_length()));
visitor_->OnCongestionWindowChange(clock_->ApproximateNow());
}
@@ -1686,7 +1684,8 @@ void QuicConnection::SetEncrypter(EncryptionLevel level,
// 3 times the current congestion window (in slow start) should cover
// about two full round trips worth of packets, which should be
// sufficient.
- 3 * sent_packet_manager_.GetCongestionWindow() / max_packet_length();
+ 3 * sent_packet_manager_.EstimateMaxPacketsInFlight(
+ max_packet_length());
}
}
@@ -1940,11 +1939,7 @@ void QuicConnection::SetIdleNetworkTimeout(QuicTime::Delta timeout) {
if (timeout < idle_network_timeout_) {
idle_network_timeout_ = timeout;
- if (FLAGS_quic_timeouts_only_from_alarms) {
- SetTimeoutAlarm();
- } else {
- CheckForTimeout();
- }
+ SetTimeoutAlarm();
} else {
idle_network_timeout_ = timeout;
}
@@ -1953,11 +1948,7 @@ void QuicConnection::SetIdleNetworkTimeout(QuicTime::Delta timeout) {
void QuicConnection::SetOverallConnectionTimeout(QuicTime::Delta timeout) {
if (timeout < overall_connection_timeout_) {
overall_connection_timeout_ = timeout;
- if (FLAGS_quic_timeouts_only_from_alarms) {
- SetTimeoutAlarm();
- } else {
- CheckForTimeout();
- }
+ SetTimeoutAlarm();
} else {
overall_connection_timeout_ = timeout;
}
« no previous file with comments | « net/quic/quic_connection.h ('k') | net/quic/quic_connection_stats.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698