gfe-relnote: deprecate gfe2_reloadable_flag_quic_eliminate_static_stream_map_3.
Note that static_stream_map still exists. More clean up will come in follow up CLs.
PiperOrigin-RevId: 257075373
Change-Id: I39fe8e561f5575ed491829cac3d528e7c1d04bf8
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index 0cd5f90..0c26de7 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -344,10 +344,9 @@
static_cast<QuicSpdyStream*>(kv.second.get())->ClearSession();
}
for (auto const& kv : dynamic_streams()) {
- if (eliminate_static_stream_map() && kv.second->is_static()) {
- continue;
+ if (!kv.second->is_static()) {
+ static_cast<QuicSpdyStream*>(kv.second.get())->ClearSession();
}
- static_cast<QuicSpdyStream*>(kv.second.get())->ClearSession();
}
}
@@ -375,19 +374,12 @@
headers_stream_ = QuicMakeUnique<QuicHeadersStream>((this));
DCHECK_EQ(QuicUtils::GetHeadersStreamId(connection()->transport_version()),
headers_stream_->id());
- if (!eliminate_static_stream_map()) {
- RegisterStaticStream(
- QuicUtils::GetHeadersStreamId(connection()->transport_version()),
- headers_stream_.get());
- } else {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map_3, 7, 17);
- unowned_headers_stream_ = headers_stream_.get();
- RegisterStaticStreamNew(std::move(headers_stream_),
- /*stream_already_counted = */ false);
- }
- if (VersionHasStreamType(connection()->transport_version()) &&
- eliminate_static_stream_map()) {
+ unowned_headers_stream_ = headers_stream_.get();
+ RegisterStaticStreamNew(std::move(headers_stream_),
+ /*stream_already_counted = */ false);
+
+ if (VersionHasStreamType(connection()->transport_version())) {
auto send_control = QuicMakeUnique<QuicSendControlStream>(
GetNextOutgoingUnidirectionalStreamId(), this,
max_inbound_header_list_size_);
@@ -737,13 +729,9 @@
}
bool QuicSpdySession::HasActiveRequestStreams() const {
- if (!eliminate_static_stream_map()) {
- return !dynamic_streams().empty();
- }
// In the case where session is destructed by calling
// dynamic_streams().clear(), we will have incorrect accounting here.
// TODO(renjietang): Modify destructors and make this a DCHECK.
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map_3, 9, 17);
if (static_cast<size_t>(dynamic_streams().size()) >
num_incoming_static_streams() + num_outgoing_static_streams()) {
return dynamic_streams().size() - num_incoming_static_streams() -
diff --git a/quic/core/http/quic_spdy_session.h b/quic/core/http/quic_spdy_session.h
index a0ddac4..93f121c 100644
--- a/quic/core/http/quic_spdy_session.h
+++ b/quic/core/http/quic_spdy_session.h
@@ -147,14 +147,10 @@
QpackEncoder* qpack_encoder();
QpackDecoder* qpack_decoder();
- QuicHeadersStream* headers_stream() {
- return eliminate_static_stream_map() ? unowned_headers_stream_
- : headers_stream_.get();
- }
+ QuicHeadersStream* headers_stream() { return unowned_headers_stream_; }
const QuicHeadersStream* headers_stream() const {
- return eliminate_static_stream_map() ? unowned_headers_stream_
- : headers_stream_.get();
+ return unowned_headers_stream_;
}
bool server_push_enabled() const { return server_push_enabled_; }
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index a9540ea..4b450e9 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -927,16 +927,10 @@
EXPECT_CALL(*crypto_stream, OnCanWrite());
}
TestHeadersStream* headers_stream;
- if (!GetQuicReloadableFlag(quic_eliminate_static_stream_map_3) &&
- !QuicVersionUsesCryptoFrames(connection_->transport_version())) {
- QuicSpdySessionPeer::SetHeadersStream(&session_, nullptr);
- headers_stream = new TestHeadersStream(&session_);
- QuicSpdySessionPeer::SetHeadersStream(&session_, headers_stream);
- } else {
- QuicSpdySessionPeer::SetUnownedHeadersStream(&session_, nullptr);
- headers_stream = new TestHeadersStream(&session_);
- QuicSpdySessionPeer::SetUnownedHeadersStream(&session_, headers_stream);
- }
+
+ QuicSpdySessionPeer::SetUnownedHeadersStream(&session_, nullptr);
+ headers_stream = new TestHeadersStream(&session_);
+ QuicSpdySessionPeer::SetUnownedHeadersStream(&session_, headers_stream);
session_.MarkConnectionLevelWriteBlocked(
QuicUtils::GetHeadersStreamId(connection_->transport_version()));
EXPECT_CALL(*headers_stream, OnCanWrite());
@@ -1747,16 +1741,9 @@
TEST_P(QuicSpdySessionTestClient, WritePriority) {
TestHeadersStream* headers_stream;
- if (!GetQuicReloadableFlag(quic_eliminate_static_stream_map_3) &&
- !QuicVersionUsesCryptoFrames(connection_->transport_version())) {
- QuicSpdySessionPeer::SetHeadersStream(&session_, nullptr);
- headers_stream = new TestHeadersStream(&session_);
- QuicSpdySessionPeer::SetHeadersStream(&session_, headers_stream);
- } else {
- QuicSpdySessionPeer::SetUnownedHeadersStream(&session_, nullptr);
- headers_stream = new TestHeadersStream(&session_);
- QuicSpdySessionPeer::SetUnownedHeadersStream(&session_, headers_stream);
- }
+ QuicSpdySessionPeer::SetUnownedHeadersStream(&session_, nullptr);
+ headers_stream = new TestHeadersStream(&session_);
+ QuicSpdySessionPeer::SetUnownedHeadersStream(&session_, headers_stream);
// Make packet writer blocked so |headers_stream| will buffer its write data.
MockPacketWriter* writer = static_cast<MockPacketWriter*>(
@@ -2089,8 +2076,7 @@
}
TEST_P(QuicSpdySessionTestServer, ReceiveControlStream) {
- if (!VersionHasStreamType(transport_version()) ||
- !GetQuicReloadableFlag(quic_eliminate_static_stream_map_3)) {
+ if (!VersionHasStreamType(transport_version())) {
return;
}
// Use a arbitrary stream id.
@@ -2115,8 +2101,7 @@
}
TEST_P(QuicSpdySessionTestServer, ReceiveControlStreamOutOfOrderDelivery) {
- if (!VersionHasStreamType(transport_version()) ||
- !GetQuicReloadableFlag(quic_eliminate_static_stream_map_3)) {
+ if (!VersionHasStreamType(transport_version())) {
return;
}
// Use an arbitrary stream id.
