Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/congestion_control/tcp_cubic_sender_bytes.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/congestion_control/tcp_cubic_sender_bytes.h"
 
 #include <algorithm>
 
 #include "net/quic/congestion_control/prr_sender.h"
 #include "net/quic/congestion_control/rtt_stats.h"
@@ skipping 62 matching lines @@
 void TcpCubicSenderBytes::SetMinCongestionWindowInPackets(
     QuicPacketCount congestion_window) {
   min_congestion_window_ = congestion_window * kDefaultTCPMSS;
 }
 
 void TcpCubicSenderBytes::SetNumEmulatedConnections(int num_connections) {
   TcpCubicSenderBase::SetNumEmulatedConnections(num_connections);
   cubic_.SetNumConnections(num_connections_);
 }
 
-void TcpCubicSenderBytes::SetMaxCongestionWindow(
-    QuicByteCount max_congestion_window) {
-  DCHECK(!FLAGS_quic_ignore_srbf);
-  max_congestion_window_ = max_congestion_window;
-}
-
 void TcpCubicSenderBytes::ExitSlowstart() {
   slowstart_threshold_ = congestion_window_;
 }
 
 void TcpCubicSenderBytes::OnPacketLost(QuicPacketNumber packet_number,
                                        QuicByteCount lost_bytes,
                                        QuicByteCount bytes_in_flight) {
   // TCP NewReno (RFC6582) says that once a loss occurs, any losses in packets
   // already sent should be treated as a single loss event, since it's expected.
   if (packet_number <= largest_sent_at_last_cutback_) {
@@ skipping 17 matching lines @@
     ++stats_->slowstart_packets_lost;
   }
 
   if (!no_prr_) {
     prr_.OnPacketLost(bytes_in_flight);
   }
 
   // TODO(jri): Separate out all of slow start into a separate class.
   if (slow_start_large_reduction_ && InSlowStart()) {
     DCHECK_LT(kDefaultTCPMSS, congestion_window_);
-    if (FLAGS_quic_sslr_limit_reduction &&
-        congestion_window_ >= 2 * initial_tcp_congestion_window_) {
+    if (congestion_window_ >= 2 * initial_tcp_congestion_window_) {
       min_slow_start_exit_window_ = congestion_window_ / 2;
     }
     congestion_window_ = congestion_window_ - kDefaultTCPMSS;
   } else if (reno_) {
     congestion_window_ = congestion_window_ * RenoBeta();
   } else {
     congestion_window_ =
         cubic_.CongestionWindowAfterPacketLoss(congestion_window_);
   }
   if (congestion_window_ < min_congestion_window_) {
@@ skipping 77 matching lines @@
   congestion_window_ = initial_tcp_congestion_window_;
   max_congestion_window_ = initial_max_tcp_congestion_window_;
   slowstart_threshold_ = initial_max_tcp_congestion_window_;
 }
 
 CongestionControlType TcpCubicSenderBytes::GetCongestionControlType() const {
   return reno_ ? kRenoBytes : kCubicBytes;
 }
 
 }  // namespace net