commit c1cab06be6b47a0f96c7dff58802680b2b583b88
author zhongyi <zhongyi@google.com> Wed Jun 19 12:02:24 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 19 12:18:35 2019 -0700
tree 6ff3749ef5b679969f674ada680edd16f2471f42
parent 7ae3d606ea1799033d164b6faba2495abdbd6257

gfe-relnote: Deprecate --gfe2_reloadable_flag_quic_fix_time_of_first_packet_sent_after_receiving.

PiperOrigin-RevId: 254043116
Change-Id: I996b5ddb083660867dad9268afb2e4a120b14f80

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 71d3156..bca1ca3 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -304,11 +304,7 @@
                         this),
       idle_network_timeout_(QuicTime::Delta::Infinite()),
       handshake_timeout_(QuicTime::Delta::Infinite()),
-      time_of_first_packet_sent_after_receiving_(
-          GetQuicReloadableFlag(
-              quic_fix_time_of_first_packet_sent_after_receiving)
-              ? QuicTime::Zero()
-              : clock_->ApproximateNow()),
+      time_of_first_packet_sent_after_receiving_(QuicTime::Zero()),
       time_of_last_received_packet_(clock_->ApproximateNow()),
       time_of_previous_received_packet_(QuicTime::Zero()),
       sent_packet_manager_(
@@ -2569,27 +2565,13 @@
       SetPathDegradingAlarm();
     }
 
-    if (GetQuicReloadableFlag(
-            quic_fix_time_of_first_packet_sent_after_receiving)) {
-      // Update |time_of_first_packet_sent_after_receiving_| if this is the
-      // first packet sent after the last packet was received. If it were
-      // updated on every sent packet, then sending into a black hole might
-      // never timeout.
-      if (time_of_first_packet_sent_after_receiving_ <
-          time_of_last_received_packet_) {
-        QUIC_RELOADABLE_FLAG_COUNT(
-            quic_fix_time_of_first_packet_sent_after_receiving);
-        time_of_first_packet_sent_after_receiving_ = packet_send_time;
-      }
-    } else {
-      // Only adjust the last sent time (for the purpose of tracking the idle
-      // timeout) if this is the first retransmittable packet sent after a
-      // packet is received. If it were updated on every sent packet, then
-      // sending into a black hole might never timeout.
-      if (time_of_first_packet_sent_after_receiving_ <=
-          time_of_last_received_packet_) {
-        time_of_first_packet_sent_after_receiving_ = packet_send_time;
-      }
+    // Update |time_of_first_packet_sent_after_receiving_| if this is the
+    // first packet sent after the last packet was received. If it were
+    // updated on every sent packet, then sending into a black hole might
+    // never timeout.
+    if (time_of_first_packet_sent_after_receiving_ <
+        time_of_last_received_packet_) {
+      time_of_first_packet_sent_after_receiving_ = packet_send_time;
     }
   }