commit 24d8d70087be40f0ba0f1f20c2573a38c5d047cb
author haoyuewang <haoyuewang@google.com> Mon Oct 19 08:05:01 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Oct 19 08:06:00 2020 -0700
tree d890e43a751b3cba429ab8ef1410770dc3976d82
parent 34a2680533d9bb39e0f8f191dcd121eda634e3f2

Add kAFF2 enabling the sending of AckFrequencyFrame upon handshake completion.

Protected by FLAGS_quic_reloadable_flag_quic_can_send_ack_frequency.

PiperOrigin-RevId: 337855733
Change-Id: I45e3c11605e37c01e217a7a86237f35cdfb806c9

quic/core/quic_sent_packet_manager.cc

diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index bdad0e4..01e2840 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -726,13 +726,17 @@
     return frame;
   }
 
-  QUIC_RELOADABLE_FLAG_COUNT(quic_can_send_ack_frequency);
+  QUIC_RELOADABLE_FLAG_COUNT_N(quic_can_send_ack_frequency, 1, 3);
   frame.packet_tolerance = kMaxRetransmittablePacketsBeforeAck;
   auto rtt = use_smoothed_rtt_in_ack_delay_ ? rtt_stats_.SmoothedOrInitialRtt()
                                             : rtt_stats_.MinOrInitialRtt();
   frame.max_ack_delay = rtt * kAckDecimationDelay;
   frame.max_ack_delay = std::max(frame.max_ack_delay, peer_min_ack_delay_);
-
+  // TODO(haoyuewang) Remove this once kDefaultMinAckDelayTimeMs is updated to
+  // 5 ms on the client side.
+  frame.max_ack_delay =
+      std::max(frame.max_ack_delay,
+               QuicTime::Delta::FromMilliseconds(kDefaultMinAckDelayTimeMs));
   return frame;
 }