Deprecate --gfe2_reloadable_flag_quic_deallocate_message_right_after_sent.
PiperOrigin-RevId: 344820719
Change-Id: I8fe6211151d1c727df381064a39645b539682823
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 470fa45..a193d50 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -18,7 +18,6 @@
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_can_send_ack_frequency, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_conservative_bursts, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_deallocate_message_right_after_sent, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_on_pto, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_to_2_rttvar, true)
diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index 21a9626..30ca57b 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -833,16 +833,13 @@
one_rtt_packet_sent_ = true;
}
- if (GetQuicReloadableFlag(quic_deallocate_message_right_after_sent)) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_deallocate_message_right_after_sent);
- // Deallocate message data in QuicMessageFrame immediately after packet
- // sent.
- if (packet.has_message) {
- for (auto& frame : mutable_packet->retransmittable_frames) {
- if (frame.type == MESSAGE_FRAME) {
- frame.message_frame->message_data.clear();
- frame.message_frame->message_length = 0;
- }
+ // Deallocate message data in QuicMessageFrame immediately after packet
+ // sent.
+ if (packet.has_message) {
+ for (auto& frame : mutable_packet->retransmittable_frames) {
+ if (frame.type == MESSAGE_FRAME) {
+ frame.message_frame->message_data.clear();
+ frame.message_frame->message_length = 0;
}
}
}
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index 1aa4974..fdc7874 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -4459,8 +4459,6 @@
}
TEST_F(QuicSentPacketManagerTest, ClearDataInMessageFrameAfterPacketSent) {
- SetQuicReloadableFlag(quic_deallocate_message_right_after_sent, true);
-
EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _)).Times(1);
QuicMessageFrame* message_frame = nullptr;
