commit 9fa2be314ae8b59537af30d51c6e4fa12b331d79
author zhongyi <zhongyi@google.com> Tue Sep 10 12:39:01 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Sep 12 11:47:31 2019 -0700
tree ebf6b99895ce1c1728a933dba32f92b65cb67242
parent 16df2a541ae9bd54de31fee74567ebf5f49563a3

gfe-relnote: deprecate quic_ignore_tlpr_if_no_pending_stream_data.

PiperOrigin-RevId: 268284975
Change-Id: I9e22888285453fa081e9ed44493c0e6aebe71de9

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index f4e3f8a..68cfd6d 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -827,10 +827,7 @@
     zombie_streams_[stream->id()] = std::move(it->second);
   } else {
     // Clean up the stream since it is no longer waiting for acks.
-    if (ignore_tlpr_if_no_pending_stream_data() &&
-        session_decides_what_to_write()) {
-      QUIC_RELOADABLE_FLAG_COUNT_N(quic_ignore_tlpr_if_no_pending_stream_data,
-                                   2, 5);
+    if (session_decides_what_to_write()) {
       streams_waiting_for_acks_.erase(stream->id());
     }
     closed_streams_.push_back(std::move(it->second));
@@ -1486,10 +1483,7 @@
 }
 
 void QuicSession::OnStreamDoneWaitingForAcks(QuicStreamId id) {
-  if (ignore_tlpr_if_no_pending_stream_data() &&
-      session_decides_what_to_write()) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_ignore_tlpr_if_no_pending_stream_data, 3,
-                                 5);
+  if (session_decides_what_to_write()) {
     streams_waiting_for_acks_.erase(id);
   }
 
@@ -1508,8 +1502,7 @@
 }
 
 void QuicSession::OnStreamWaitingForAcks(QuicStreamId id) {
-  if (!ignore_tlpr_if_no_pending_stream_data() ||
-      !session_decides_what_to_write())
+  if (!session_decides_what_to_write())
     return;
 
   // Exclude crypto stream's status since it is counted in HasUnackedCryptoData.
@@ -1517,8 +1510,6 @@
     return;
   }
 
-  QUIC_RELOADABLE_FLAG_COUNT_N(quic_ignore_tlpr_if_no_pending_stream_data, 4,
-                               5);
   streams_waiting_for_acks_.insert(id);
 
   // The number of the streams waiting for acks should not be larger than the
@@ -1675,14 +1666,7 @@
 }
 
 bool QuicSession::HasUnackedStreamData() const {
-  DCHECK(ignore_tlpr_if_no_pending_stream_data());
-  if (ignore_tlpr_if_no_pending_stream_data()) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_ignore_tlpr_if_no_pending_stream_data, 5,
-                                 5);
-    return !streams_waiting_for_acks_.empty();
-  }
-
-  return true;
+  return !streams_waiting_for_acks_.empty();
 }
 
 WriteStreamDataResult QuicSession::WriteStreamData(QuicStreamId id,