Rename quic::kMaxPacketSize to quic::kMaxOutgoingPacketSize
As part of cl/242197597, QUIC now has separate values for maximum incoming and outgoing packet sizes. This CL renames the constant to be clearer.
gfe-relnote: constant rename, no functional impact
PiperOrigin-RevId: 242708648
Change-Id: I3f440ba44b9c12394026116aaecdd2c166cc63b6
diff --git a/quic/core/congestion_control/bbr_sender.cc b/quic/core/congestion_control/bbr_sender.cc
index 9de79cd..1c0d274 100644
--- a/quic/core/congestion_control/bbr_sender.cc
+++ b/quic/core/congestion_control/bbr_sender.cc
@@ -686,7 +686,7 @@
// we allow an extra packet since QUIC checks CWND before sending a
// packet.
if (unacked_packets_->bytes_in_flight() <
- ProbeRttCongestionWindow() + kMaxPacketSize) {
+ ProbeRttCongestionWindow() + kMaxOutgoingPacketSize) {
exit_probe_rtt_at_ = now + kProbeRttTime;
probe_rtt_round_passed_ = false;
}
diff --git a/quic/core/congestion_control/bbr_sender_test.cc b/quic/core/congestion_control/bbr_sender_test.cc
index b3ed286..3d40e0a 100644
--- a/quic/core/congestion_control/bbr_sender_test.cc
+++ b/quic/core/congestion_control/bbr_sender_test.cc
@@ -63,8 +63,8 @@
const QuicTime::Delta kLocalPropagationDelay =
QuicTime::Delta::FromMilliseconds(2);
const QuicTime::Delta kTestTransferTime =
- kTestLinkBandwidth.TransferTime(kMaxPacketSize) +
- kLocalLinkBandwidth.TransferTime(kMaxPacketSize);
+ kTestLinkBandwidth.TransferTime(kMaxOutgoingPacketSize) +
+ kLocalLinkBandwidth.TransferTime(kMaxOutgoingPacketSize);
const QuicTime::Delta kTestRtt =
(kTestPropagationDelay + kLocalPropagationDelay + kTestTransferTime) * 2;
const QuicByteCount kTestBdp = kTestRtt * kTestLinkBandwidth;
@@ -1091,7 +1091,8 @@
QuicBandwidth pacing_rate = original_pacing_rate;
const QuicByteCount original_cwnd = sender_->GetCongestionWindow();
LostPacketVector lost_packets;
- lost_packets.push_back(LostPacket(QuicPacketNumber(), kMaxPacketSize));
+ lost_packets.push_back(
+ LostPacket(QuicPacketNumber(), kMaxOutgoingPacketSize));
QuicPacketNumber largest_sent =
bbr_sender_.connection()->sent_packet_manager().GetLargestSentPacket();
for (QuicPacketNumber packet_number =
@@ -1141,7 +1142,8 @@
QuicBandwidth pacing_rate = original_pacing_rate;
const QuicByteCount original_cwnd = sender_->GetCongestionWindow();
LostPacketVector lost_packets;
- lost_packets.push_back(LostPacket(QuicPacketNumber(), kMaxPacketSize));
+ lost_packets.push_back(
+ LostPacket(QuicPacketNumber(), kMaxOutgoingPacketSize));
QuicPacketNumber largest_sent =
bbr_sender_.connection()->sent_packet_manager().GetLargestSentPacket();
for (QuicPacketNumber packet_number =
diff --git a/quic/core/congestion_control/general_loss_algorithm_test.cc b/quic/core/congestion_control/general_loss_algorithm_test.cc
index c6e0145..0172dfc 100644
--- a/quic/core/congestion_control/general_loss_algorithm_test.cc
+++ b/quic/core/congestion_control/general_loss_algorithm_test.cc
@@ -92,20 +92,20 @@
AckedPacketVector packets_acked;
// No loss on one ack.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
// No loss on two acks.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(3));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(3), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(3), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(3, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
// Loss on three acks.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(4));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(4), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(4), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(4, packets_acked, {1});
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
}
@@ -121,14 +121,14 @@
AckedPacketVector packets_acked;
// Nack the first packet 3 times in a single StretchAck.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(3));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(3), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(3), kMaxOutgoingPacketSize, QuicTime::Zero()));
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(4));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(4), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(4), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(4, packets_acked, {1});
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
}
@@ -143,8 +143,8 @@
AckedPacketVector packets_acked;
// Nack the first packet 3 times in an AckFrame with three missing packets.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(4));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(4), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(4), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(4, packets_acked, {1});
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
}
@@ -158,8 +158,8 @@
AckedPacketVector packets_acked;
// Early retransmit when the final packet gets acked and the first is nacked.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
EXPECT_EQ(clock_.Now() + 1.25 * rtt_stats_.smoothed_rtt(),
@@ -184,7 +184,8 @@
// elapsed since the packets were sent.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(kNumSentPackets));
packets_acked.push_back(AckedPacket(QuicPacketNumber(kNumSentPackets),
- kMaxPacketSize, QuicTime::Zero()));
+ kMaxOutgoingPacketSize,
+ QuicTime::Zero()));
// This simulates a single ack following multiple missing packets with FACK.
VerifyLosses(kNumSentPackets, packets_acked, {1, 2});
packets_acked.clear();
@@ -221,8 +222,8 @@
unacked_packets_.IncreaseLargestAcked(QuicPacketNumber(2));
}
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
EXPECT_EQ(clock_.Now() + 0.25 * rtt_stats_.smoothed_rtt(),
loss_algorithm_.GetLossTimeout());
@@ -244,8 +245,8 @@
unacked_packets_.IncreaseLargestAcked(QuicPacketNumber(2));
}
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
EXPECT_EQ(clock_.Now() + 0.25 * rtt_stats_.smoothed_rtt(),
@@ -276,8 +277,8 @@
unacked_packets_.IncreaseLargestAcked(QuicPacketNumber(2));
}
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(2, packets_acked, {1});
}
@@ -292,20 +293,20 @@
AckedPacketVector packets_acked;
// No loss on one ack.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
// No loss on two acks.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(3));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(3), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(3), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(3, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
// Loss on three acks.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(4));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(4), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(4), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(4, packets_acked, {1});
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
}
@@ -323,22 +324,22 @@
AckedPacketVector packets_acked;
// Nack the first packet 3 times in a single StretchAck.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(3));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(3), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(3), kMaxOutgoingPacketSize, QuicTime::Zero()));
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(4));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(4), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(4), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(4, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
// The timer isn't set because we expect more acks.
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
// Process another ack and then packet 1 will be lost.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(5));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(5), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(5), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(5, packets_acked, {1});
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
}
@@ -354,16 +355,16 @@
AckedPacketVector packets_acked;
// Nack the first packet 3 times in an AckFrame with three missing packets.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(4));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(4), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(4), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(4, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
// The timer isn't set because we expect more acks.
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
// Process another ack and then packet 1 and 2 will be lost.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(5));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(5), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(5), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(5, packets_acked, {1, 2});
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
}
@@ -378,8 +379,8 @@
}
AckedPacketVector packets_acked;
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
for (size_t i = 1; i < 500; ++i) {
VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
@@ -406,8 +407,8 @@
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
// The packet should not be lost until 1.25 RTTs pass.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
if (GetQuicReloadableFlag(quic_eighth_rtt_loss_detection)) {
@@ -438,8 +439,8 @@
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
// The packet should not be lost without a nack.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(1));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(1), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(1), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(1, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
// The timer should still not be set.
@@ -465,8 +466,8 @@
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
// The packet should not be lost until 1.25 RTTs pass.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(10));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(10), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(10), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(10, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
if (GetQuicReloadableFlag(quic_eighth_rtt_loss_detection)) {
@@ -497,8 +498,8 @@
// The packet should not be lost until 1.25 RTTs pass.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(10));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(10), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(10), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(10, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
if (GetQuicReloadableFlag(quic_eighth_rtt_loss_detection)) {
@@ -515,8 +516,8 @@
// are lost.
for (uint64_t i = 1; i <= 9; ++i) {
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(i));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(i), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(i), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(i, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
@@ -538,8 +539,8 @@
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
// Packet 1 should not be lost until 1/16 RTTs pass.
unacked_packets_.RemoveFromInFlight(QuicPacketNumber(2));
- packets_acked.push_back(
- AckedPacket(QuicPacketNumber(2), kMaxPacketSize, QuicTime::Zero()));
+ packets_acked.push_back(AckedPacket(
+ QuicPacketNumber(2), kMaxOutgoingPacketSize, QuicTime::Zero()));
VerifyLosses(2, packets_acked, std::vector<uint64_t>{});
packets_acked.clear();
// Expect the timer to be set to 1/16 RTT's in the future.
diff --git a/quic/core/congestion_control/pacing_sender_test.cc b/quic/core/congestion_control/pacing_sender_test.cc
index 3ed881a..ea9debf 100644
--- a/quic/core/congestion_control/pacing_sender_test.cc
+++ b/quic/core/congestion_control/pacing_sender_test.cc
@@ -52,7 +52,8 @@
if (burst_size == 0) {
EXPECT_CALL(*mock_sender_, OnCongestionEvent(_, _, _, _, _));
LostPacketVector lost_packets;
- lost_packets.push_back(LostPacket(QuicPacketNumber(1), kMaxPacketSize));
+ lost_packets.push_back(
+ LostPacket(QuicPacketNumber(1), kMaxOutgoingPacketSize));
AckedPacketVector empty;
pacing_sender_->OnCongestionEvent(true, 1234, clock_.Now(), empty,
lost_packets);
@@ -84,15 +85,16 @@
}
EXPECT_CALL(*mock_sender_,
OnPacketSent(clock_.Now(), bytes_in_flight, packet_number_,
- kMaxPacketSize, retransmittable_data));
+ kMaxOutgoingPacketSize, retransmittable_data));
EXPECT_CALL(*mock_sender_, GetCongestionWindow())
.Times(AtMost(1))
.WillRepeatedly(Return(cwnd * kDefaultTCPMSS));
- EXPECT_CALL(*mock_sender_, CanSend(bytes_in_flight + kMaxPacketSize))
+ EXPECT_CALL(*mock_sender_,
+ CanSend(bytes_in_flight + kMaxOutgoingPacketSize))
.Times(AtMost(1))
.WillRepeatedly(Return(!cwnd_limited));
pacing_sender_->OnPacketSent(clock_.Now(), bytes_in_flight,
- packet_number_++, kMaxPacketSize,
+ packet_number_++, kMaxOutgoingPacketSize,
retransmittable_data);
}
@@ -151,8 +153,9 @@
TEST_F(PacingSenderTest, VariousSending) {
// Configure pacing rate of 1 packet per 1 ms, no initial burst.
- InitPacingRate(0, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
+ InitPacingRate(
+ 0, QuicBandwidth::FromBytesAndTimeDelta(
+ kMaxOutgoingPacketSize, QuicTime::Delta::FromMilliseconds(1)));
// Now update the RTT and verify that packets are actually paced.
UpdateRtt();
@@ -206,8 +209,9 @@
TEST_F(PacingSenderTest, InitialBurst) {
// Configure pacing rate of 1 packet per 1 ms.
- InitPacingRate(10, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
+ InitPacingRate(
+ 10, QuicBandwidth::FromBytesAndTimeDelta(
+ kMaxOutgoingPacketSize, QuicTime::Delta::FromMilliseconds(1)));
// Update the RTT and verify that the first 10 packets aren't paced.
UpdateRtt();
@@ -242,8 +246,9 @@
TEST_F(PacingSenderTest, InitialBurstNoRttMeasurement) {
// Configure pacing rate of 1 packet per 1 ms.
- InitPacingRate(10, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
+ InitPacingRate(
+ 10, QuicBandwidth::FromBytesAndTimeDelta(
+ kMaxOutgoingPacketSize, QuicTime::Delta::FromMilliseconds(1)));
// Send 10 packets, and verify that they are not paced.
for (int i = 0; i < kInitialBurstPackets; ++i) {
@@ -277,9 +282,9 @@
TEST_F(PacingSenderTest, FastSending) {
// Ensure the pacing sender paces, even when the inter-packet spacing is less
// than the pacing granularity.
- InitPacingRate(10,
- QuicBandwidth::FromBytesAndTimeDelta(
- 2 * kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
+ InitPacingRate(10, QuicBandwidth::FromBytesAndTimeDelta(
+ 2 * kMaxOutgoingPacketSize,
+ QuicTime::Delta::FromMilliseconds(1)));
// Update the RTT and verify that the first 10 packets aren't paced.
UpdateRtt();
@@ -315,18 +320,20 @@
TEST_F(PacingSenderTest, NoBurstEnteringRecovery) {
// Configure pacing rate of 1 packet per 1 ms with no burst tokens.
- InitPacingRate(0, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
+ InitPacingRate(
+ 0, QuicBandwidth::FromBytesAndTimeDelta(
+ kMaxOutgoingPacketSize, QuicTime::Delta::FromMilliseconds(1)));
// Sending a packet will set burst tokens.
CheckPacketIsSentImmediately();
// Losing a packet will set clear burst tokens.
LostPacketVector lost_packets;
- lost_packets.push_back(LostPacket(QuicPacketNumber(1), kMaxPacketSize));
+ lost_packets.push_back(
+ LostPacket(QuicPacketNumber(1), kMaxOutgoingPacketSize));
AckedPacketVector empty_acked;
EXPECT_CALL(*mock_sender_,
- OnCongestionEvent(true, kMaxPacketSize, _, IsEmpty(), _));
- pacing_sender_->OnCongestionEvent(true, kMaxPacketSize, clock_.Now(),
+ OnCongestionEvent(true, kMaxOutgoingPacketSize, _, IsEmpty(), _));
+ pacing_sender_->OnCongestionEvent(true, kMaxOutgoingPacketSize, clock_.Now(),
empty_acked, lost_packets);
// One packet is sent immediately, because of 1ms pacing granularity.
CheckPacketIsSentImmediately();
@@ -340,8 +347,9 @@
TEST_F(PacingSenderTest, NoBurstInRecovery) {
// Configure pacing rate of 1 packet per 1 ms with no burst tokens.
- InitPacingRate(0, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
+ InitPacingRate(
+ 0, QuicBandwidth::FromBytesAndTimeDelta(
+ kMaxOutgoingPacketSize, QuicTime::Delta::FromMilliseconds(1)));
UpdateRtt();
@@ -353,8 +361,9 @@
TEST_F(PacingSenderTest, CwndLimited) {
// Configure pacing rate of 1 packet per 1 ms, no initial burst.
- InitPacingRate(0, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
+ InitPacingRate(
+ 0, QuicBandwidth::FromBytesAndTimeDelta(
+ kMaxOutgoingPacketSize, QuicTime::Delta::FromMilliseconds(1)));
UpdateRtt();
@@ -382,8 +391,9 @@
SetQuicFlag(&FLAGS_quic_lumpy_pacing_size, 3);
SetQuicFlag(&FLAGS_quic_lumpy_pacing_cwnd_fraction, 0.5f);
// Configure pacing rate of 1 packet per 1 ms.
- InitPacingRate(10, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
+ InitPacingRate(
+ 10, QuicBandwidth::FromBytesAndTimeDelta(
+ kMaxOutgoingPacketSize, QuicTime::Delta::FromMilliseconds(1)));
UpdateRtt();
// Send 10 packets, and verify that they are not paced.
@@ -438,8 +448,9 @@
// Configure pacing rate of 1 packet per 100 ms.
QuicTime::Delta inter_packet_delay = QuicTime::Delta::FromMilliseconds(100);
- InitPacingRate(kInitialBurstPackets, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, inter_packet_delay));
+ InitPacingRate(kInitialBurstPackets,
+ QuicBandwidth::FromBytesAndTimeDelta(kMaxOutgoingPacketSize,
+ inter_packet_delay));
UpdateRtt();
// Send kInitialBurstPackets packets, and verify that they are not paced.
diff --git a/quic/core/congestion_control/send_algorithm_test.cc b/quic/core/congestion_control/send_algorithm_test.cc
index b2fa2f8..c07508c 100644
--- a/quic/core/congestion_control/send_algorithm_test.cc
+++ b/quic/core/congestion_control/send_algorithm_test.cc
@@ -63,8 +63,8 @@
const QuicTime::Delta kTestLinkWiredPropagationDelay =
QuicTime::Delta::FromMilliseconds(50);
const QuicTime::Delta kTestWiredTransferTime =
- kTestLinkWiredBandwidth.TransferTime(kMaxPacketSize) +
- kLocalLinkBandwidth.TransferTime(kMaxPacketSize);
+ kTestLinkWiredBandwidth.TransferTime(kMaxOutgoingPacketSize) +
+ kLocalLinkBandwidth.TransferTime(kMaxOutgoingPacketSize);
const QuicTime::Delta kTestWiredRtt =
(kTestLinkWiredPropagationDelay + kLocalPropagationDelay +
kTestWiredTransferTime) *
@@ -79,7 +79,7 @@
QuicBandwidth::FromKBitsPerSecond(200);
const QuicTime::Delta kTestLinkLowBdpPropagationDelay =
QuicTime::Delta::FromMilliseconds(50);
-const QuicByteCount kTestPolicerQueue = kMaxPacketSize;
+const QuicByteCount kTestPolicerQueue = kMaxOutgoingPacketSize;
// Satellite network settings. In a satellite network, the bottleneck
// buffer is typically sized for non-satellite links , but the
diff --git a/quic/core/congestion_control/uber_loss_algorithm_test.cc b/quic/core/congestion_control/uber_loss_algorithm_test.cc
index ee61e42..2945214 100644
--- a/quic/core/congestion_control/uber_loss_algorithm_test.cc
+++ b/quic/core/congestion_control/uber_loss_algorithm_test.cc
@@ -50,8 +50,8 @@
packets_acked_.clear();
for (uint64_t acked : packets_acked) {
unacked_packets_->RemoveFromInFlight(QuicPacketNumber(acked));
- packets_acked_.push_back(AckedPacket(QuicPacketNumber(acked),
- kMaxPacketSize, QuicTime::Zero()));
+ packets_acked_.push_back(AckedPacket(
+ QuicPacketNumber(acked), kMaxOutgoingPacketSize, QuicTime::Zero()));
}
}
