Convert kDefaultMaxCongestionWindowPackets to a flag. gfe-relnote: n/a (No functional change) PiperOrigin-RevId: 277743018 Change-Id: I823451777c6688fa78642202f6052f5b5f12ca31
diff --git a/quic/core/congestion_control/bbr2_simulator_test.cc b/quic/core/congestion_control/bbr2_simulator_test.cc index 193196f..b2b4d9b 100644 --- a/quic/core/congestion_control/bbr2_simulator_test.cc +++ b/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -147,8 +147,9 @@ endpoint->connection()->sent_packet_manager().GetRttStats(), QuicSentPacketManagerPeer::GetUnackedPacketMap( QuicConnectionPeer::GetSentPacketManager(endpoint->connection())), - kDefaultInitialCwndPackets, kDefaultMaxCongestionWindowPackets, - &random_, QuicConnectionPeer::GetStats(endpoint->connection())); + kDefaultInitialCwndPackets, + GetQuicFlag(FLAGS_quic_max_congestion_window), &random_, + QuicConnectionPeer::GetStats(endpoint->connection())); QuicConnectionPeer::SetSendAlgorithm(endpoint->connection(), sender); endpoint->RecordTrace(); return sender; @@ -780,8 +781,9 @@ endpoint->connection()->sent_packet_manager().GetRttStats(), QuicSentPacketManagerPeer::GetUnackedPacketMap( QuicConnectionPeer::GetSentPacketManager(endpoint->connection())), - kDefaultInitialCwndPackets, kDefaultMaxCongestionWindowPackets, - &random_, QuicConnectionPeer::GetStats(endpoint->connection())); + kDefaultInitialCwndPackets, + GetQuicFlag(FLAGS_quic_max_congestion_window), &random_, + QuicConnectionPeer::GetStats(endpoint->connection())); QuicConnectionPeer::SetSendAlgorithm(endpoint->connection(), sender); endpoint->RecordTrace(); return sender; @@ -794,8 +796,9 @@ endpoint->connection()->sent_packet_manager().GetRttStats(), QuicSentPacketManagerPeer::GetUnackedPacketMap( QuicConnectionPeer::GetSentPacketManager(endpoint->connection())), - kDefaultInitialCwndPackets, kDefaultMaxCongestionWindowPackets, - &random_, QuicConnectionPeer::GetStats(endpoint->connection())); + kDefaultInitialCwndPackets, + GetQuicFlag(FLAGS_quic_max_congestion_window), &random_, + QuicConnectionPeer::GetStats(endpoint->connection())); QuicConnectionPeer::SetSendAlgorithm(endpoint->connection(), sender); endpoint->RecordTrace(); return sender; @@ -808,7 +811,8 @@ TcpCubicSenderBytes* sender = new TcpCubicSenderBytes( endpoint->connection()->clock(), endpoint->connection()->sent_packet_manager().GetRttStats(), reno, - kDefaultInitialCwndPackets, kDefaultMaxCongestionWindowPackets, + kDefaultInitialCwndPackets, + GetQuicFlag(FLAGS_quic_max_congestion_window), QuicConnectionPeer::GetStats(endpoint->connection())); QuicConnectionPeer::SetSendAlgorithm(endpoint->connection(), sender); endpoint->RecordTrace();
diff --git a/quic/core/congestion_control/bbr_sender_test.cc b/quic/core/congestion_control/bbr_sender_test.cc index 290cf4c..9403c57 100644 --- a/quic/core/congestion_control/bbr_sender_test.cc +++ b/quic/core/congestion_control/bbr_sender_test.cc
@@ -135,8 +135,9 @@ endpoint->connection()->clock()->Now(), rtt_stats, QuicSentPacketManagerPeer::GetUnackedPacketMap( QuicConnectionPeer::GetSentPacketManager(endpoint->connection())), - kInitialCongestionWindowPackets, kDefaultMaxCongestionWindowPackets, - &random_, QuicConnectionPeer::GetStats(endpoint->connection())); + kInitialCongestionWindowPackets, + GetQuicFlag(FLAGS_quic_max_congestion_window), &random_, + QuicConnectionPeer::GetStats(endpoint->connection())); QuicConnectionPeer::SetSendAlgorithm(endpoint->connection(), sender); endpoint->RecordTrace(); return sender; @@ -379,8 +380,9 @@ bbr_sender_.connection()->clock()->Now(), rtt_stats_, QuicSentPacketManagerPeer::GetUnackedPacketMap( QuicConnectionPeer::GetSentPacketManager(bbr_sender_.connection())), - kInitialCongestionWindowPackets, kDefaultMaxCongestionWindowPackets, - &random_, QuicConnectionPeer::GetStats(bbr_sender_.connection())); + kInitialCongestionWindowPackets, + GetQuicFlag(FLAGS_quic_max_congestion_window), &random_, + QuicConnectionPeer::GetStats(bbr_sender_.connection())); QuicConnectionPeer::SetSendAlgorithm(bbr_sender_.connection(), sender_); // Enable Ack Decimation on the receiver. QuicConnectionPeer::SetAckMode(receiver_.connection(),
diff --git a/quic/core/congestion_control/send_algorithm_interface.cc b/quic/core/congestion_control/send_algorithm_interface.cc index b641eb4..83529c6 100644 --- a/quic/core/congestion_control/send_algorithm_interface.cc +++ b/quic/core/congestion_control/send_algorithm_interface.cc
@@ -27,7 +27,8 @@ QuicRandom* random, QuicConnectionStats* stats, QuicPacketCount initial_congestion_window) { - QuicPacketCount max_congestion_window = kDefaultMaxCongestionWindowPackets; + QuicPacketCount max_congestion_window = + GetQuicFlag(FLAGS_quic_max_congestion_window); switch (congestion_control_type) { case kGoogCC: // GoogCC is not supported by quic/core, fall back to BBR. case kBBR:
diff --git a/quic/core/congestion_control/send_algorithm_interface.h b/quic/core/congestion_control/send_algorithm_interface.h index dab8fc2..4f84f13 100644 --- a/quic/core/congestion_control/send_algorithm_interface.h +++ b/quic/core/congestion_control/send_algorithm_interface.h
@@ -29,8 +29,6 @@ class CachedNetworkParameters; class RttStats; -const QuicPacketCount kDefaultMaxCongestionWindowPackets = 2000; - class QUIC_EXPORT_PRIVATE SendAlgorithmInterface { public: static SendAlgorithmInterface* Create(
diff --git a/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc b/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc index 4c51742..6a338cb 100644 --- a/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc +++ b/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc
@@ -686,11 +686,11 @@ // Resumed CWND is limited to be in a sensible range. const QuicBandwidth kUnreasonableBandwidth = - QuicBandwidth::FromBytesPerSecond((kMaxCongestionWindowPackets + 1) * + QuicBandwidth::FromBytesPerSecond((kMaxResumptionCongestionWindow + 1) * kDefaultTCPMSS); sender_->AdjustNetworkParameters(kUnreasonableBandwidth, QuicTime::Delta::FromSeconds(1), false); - EXPECT_EQ(kMaxCongestionWindowPackets * kDefaultTCPMSS, + EXPECT_EQ(kMaxResumptionCongestionWindow * kDefaultTCPMSS, sender_->GetCongestionWindow()); } @@ -781,14 +781,16 @@ AckedPacketVector acked_packets; LostPacketVector missing_packets; - for (uint64_t i = 1; i < kDefaultMaxCongestionWindowPackets; ++i) { + QuicPacketCount max_congestion_window = + GetQuicFlag(FLAGS_quic_max_congestion_window); + for (uint64_t i = 1; i < max_congestion_window; ++i) { acked_packets.clear(); acked_packets.push_back( AckedPacket(QuicPacketNumber(i), 1350, QuicTime::Zero())); sender->OnCongestionEvent(true, sender->GetCongestionWindow(), clock_.Now(), acked_packets, missing_packets); } - EXPECT_EQ(kDefaultMaxCongestionWindowPackets, + EXPECT_EQ(max_congestion_window, sender->GetCongestionWindow() / kDefaultTCPMSS); }
diff --git a/quic/test_tools/simulator/quic_endpoint_test.cc b/quic/test_tools/simulator/quic_endpoint_test.cc index 772cd2e..0989a3b 100644 --- a/quic/test_tools/simulator/quic_endpoint_test.cc +++ b/quic/test_tools/simulator/quic_endpoint_test.cc
@@ -104,8 +104,8 @@ EXPECT_CALL(*sender, BandwidthEstimate()) .WillRepeatedly(Return(10 * kDefaultBandwidth)); EXPECT_CALL(*sender, GetCongestionWindow()) - .WillRepeatedly( - Return(kMaxOutgoingPacketSize * kDefaultMaxCongestionWindowPackets)); + .WillRepeatedly(Return(kMaxOutgoingPacketSize * + GetQuicFlag(FLAGS_quic_max_congestion_window))); test::QuicConnectionPeer::SetSendAlgorithm(endpoint_a.connection(), sender); // First transmit a small, packet-size chunk of data.