| Index: net/quic/congestion_control/tcp_cubic_sender_bytes.cc
|
| diff --git a/net/quic/congestion_control/tcp_cubic_sender_bytes.cc b/net/quic/congestion_control/tcp_cubic_sender_bytes.cc
|
| deleted file mode 100644
|
| index 88f02e27175508d1cd81227035c76f41e4aef2b3..0000000000000000000000000000000000000000
|
| --- a/net/quic/congestion_control/tcp_cubic_sender_bytes.cc
|
| +++ /dev/null
|
| @@ -1,217 +0,0 @@
|
| -// 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"
|
| -#include "net/quic/crypto/crypto_protocol.h"
|
| -#include "net/quic/proto/cached_network_parameters.pb.h"
|
| -#include "net/quic/quic_bug_tracker.h"
|
| -#include "net/quic/quic_flags.h"
|
| -
|
| -using std::max;
|
| -using std::min;
|
| -
|
| -namespace net {
|
| -
|
| -namespace {
|
| -// Constants based on TCP defaults.
|
| -// The minimum cwnd based on RFC 3782 (TCP NewReno) for cwnd reductions on a
|
| -// fast retransmission.
|
| -const QuicByteCount kDefaultMinimumCongestionWindow = 2 * kDefaultTCPMSS;
|
| -} // namespace
|
| -
|
| -TcpCubicSenderBytes::TcpCubicSenderBytes(
|
| - const QuicClock* clock,
|
| - const RttStats* rtt_stats,
|
| - bool reno,
|
| - QuicPacketCount initial_tcp_congestion_window,
|
| - QuicPacketCount max_congestion_window,
|
| - QuicConnectionStats* stats)
|
| - : TcpCubicSenderBase(clock, rtt_stats, reno, stats),
|
| - cubic_(clock),
|
| - num_acked_packets_(0),
|
| - congestion_window_(initial_tcp_congestion_window * kDefaultTCPMSS),
|
| - min_congestion_window_(kDefaultMinimumCongestionWindow),
|
| - max_congestion_window_(max_congestion_window * kDefaultTCPMSS),
|
| - slowstart_threshold_(max_congestion_window * kDefaultTCPMSS),
|
| - initial_tcp_congestion_window_(initial_tcp_congestion_window *
|
| - kDefaultTCPMSS),
|
| - initial_max_tcp_congestion_window_(max_congestion_window *
|
| - kDefaultTCPMSS),
|
| - min_slow_start_exit_window_(min_congestion_window_) {}
|
| -
|
| -TcpCubicSenderBytes::~TcpCubicSenderBytes() {}
|
| -
|
| -void TcpCubicSenderBytes::SetCongestionWindowFromBandwidthAndRtt(
|
| - QuicBandwidth bandwidth,
|
| - QuicTime::Delta rtt) {
|
| - QuicByteCount new_congestion_window = bandwidth.ToBytesPerPeriod(rtt);
|
| - if (FLAGS_quic_no_lower_bw_resumption_limit) {
|
| - // Limit new CWND if needed.
|
| - congestion_window_ =
|
| - max(min_congestion_window_,
|
| - min(new_congestion_window,
|
| - kMaxResumptionCongestionWindow * kDefaultTCPMSS));
|
| - } else {
|
| - congestion_window_ =
|
| - max(min(new_congestion_window,
|
| - kMaxResumptionCongestionWindow * kDefaultTCPMSS),
|
| - kMinCongestionWindowForBandwidthResumption * kDefaultTCPMSS);
|
| - }
|
| -}
|
| -
|
| -void TcpCubicSenderBytes::SetCongestionWindowInPackets(
|
| - QuicPacketCount congestion_window) {
|
| - congestion_window_ = congestion_window * kDefaultTCPMSS;
|
| -}
|
| -
|
| -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::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_) {
|
| - if (last_cutback_exited_slowstart_) {
|
| - ++stats_->slowstart_packets_lost;
|
| - stats_->slowstart_bytes_lost += lost_bytes;
|
| - if (slow_start_large_reduction_) {
|
| - // Reduce congestion window by lost_bytes for every loss.
|
| - congestion_window_ =
|
| - max(congestion_window_ - lost_bytes, min_slow_start_exit_window_);
|
| - slowstart_threshold_ = congestion_window_;
|
| - }
|
| - }
|
| - DVLOG(1) << "Ignoring loss for largest_missing:" << packet_number
|
| - << " because it was sent prior to the last CWND cutback.";
|
| - return;
|
| - }
|
| - ++stats_->tcp_loss_events;
|
| - last_cutback_exited_slowstart_ = InSlowStart();
|
| - if (InSlowStart()) {
|
| - ++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 (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_) {
|
| - congestion_window_ = min_congestion_window_;
|
| - }
|
| - slowstart_threshold_ = congestion_window_;
|
| - largest_sent_at_last_cutback_ = largest_sent_packet_number_;
|
| - // Reset packet count from congestion avoidance mode. We start counting again
|
| - // when we're out of recovery.
|
| - num_acked_packets_ = 0;
|
| - DVLOG(1) << "Incoming loss; congestion window: " << congestion_window_
|
| - << " slowstart threshold: " << slowstart_threshold_;
|
| -}
|
| -
|
| -QuicByteCount TcpCubicSenderBytes::GetCongestionWindow() const {
|
| - return congestion_window_;
|
| -}
|
| -
|
| -QuicByteCount TcpCubicSenderBytes::GetSlowStartThreshold() const {
|
| - return slowstart_threshold_;
|
| -}
|
| -
|
| -// Called when we receive an ack. Normal TCP tracks how many packets one ack
|
| -// represents, but quic has a separate ack for each packet.
|
| -void TcpCubicSenderBytes::MaybeIncreaseCwnd(
|
| - QuicPacketNumber acked_packet_number,
|
| - QuicByteCount acked_bytes,
|
| - QuicByteCount bytes_in_flight) {
|
| - QUIC_BUG_IF(InRecovery()) << "Never increase the CWND during recovery.";
|
| - // Do not increase the congestion window unless the sender is close to using
|
| - // the current window.
|
| - if (!IsCwndLimited(bytes_in_flight)) {
|
| - cubic_.OnApplicationLimited();
|
| - return;
|
| - }
|
| - if (congestion_window_ >= max_congestion_window_) {
|
| - return;
|
| - }
|
| - if (InSlowStart()) {
|
| - // TCP slow start, exponential growth, increase by one for each ACK.
|
| - congestion_window_ += kDefaultTCPMSS;
|
| - DVLOG(1) << "Slow start; congestion window: " << congestion_window_
|
| - << " slowstart threshold: " << slowstart_threshold_;
|
| - return;
|
| - }
|
| - // Congestion avoidance.
|
| - if (reno_) {
|
| - // Classic Reno congestion avoidance.
|
| - ++num_acked_packets_;
|
| - // Divide by num_connections to smoothly increase the CWND at a faster rate
|
| - // than conventional Reno.
|
| - if (num_acked_packets_ * num_connections_ >=
|
| - congestion_window_ / kDefaultTCPMSS) {
|
| - congestion_window_ += kDefaultTCPMSS;
|
| - num_acked_packets_ = 0;
|
| - }
|
| -
|
| - DVLOG(1) << "Reno; congestion window: " << congestion_window_
|
| - << " slowstart threshold: " << slowstart_threshold_
|
| - << " congestion window count: " << num_acked_packets_;
|
| - } else {
|
| - congestion_window_ =
|
| - min(max_congestion_window_,
|
| - cubic_.CongestionWindowAfterAck(acked_bytes, congestion_window_,
|
| - rtt_stats_->min_rtt()));
|
| - DVLOG(1) << "Cubic; congestion window: " << congestion_window_
|
| - << " slowstart threshold: " << slowstart_threshold_;
|
| - }
|
| -}
|
| -
|
| -void TcpCubicSenderBytes::HandleRetransmissionTimeout() {
|
| - cubic_.Reset();
|
| - slowstart_threshold_ = congestion_window_ / 2;
|
| - congestion_window_ = min_congestion_window_;
|
| -}
|
| -
|
| -void TcpCubicSenderBytes::OnConnectionMigration() {
|
| - TcpCubicSenderBase::OnConnectionMigration();
|
| - cubic_.Reset();
|
| - num_acked_packets_ = 0;
|
| - 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
|
|
|