No public description

PiperOrigin-RevId: 611479163

quiche/quic/core/congestion_control/pacing_sender.cc

diff --git a/quiche/quic/core/congestion_control/pacing_sender.cc b/quiche/quic/core/congestion_control/pacing_sender.cc
index b7ef73c..0f70955 100644
--- a/quiche/quic/core/congestion_control/pacing_sender.cc
+++ b/quiche/quic/core/congestion_control/pacing_sender.cc
@@ -25,7 +25,6 @@
       ideal_next_packet_send_time_(QuicTime::Zero()),
       initial_burst_size_(kInitialUnpacedBurst),
       lumpy_tokens_(0),
-      alarm_granularity_(kAlarmGranularity),
       pacing_limited_(false) {}
 
 PacingSender::~PacingSender() {}
@@ -164,7 +163,7 @@
   }
 
   // If the next send time is within the alarm granularity, send immediately.
-  if (ideal_next_packet_send_time_ > now + alarm_granularity_) {
+  if (ideal_next_packet_send_time_ > now + kAlarmGranularity) {
     QUIC_DVLOG(1) << "Delaying packet: "
                   << (ideal_next_packet_send_time_ - now).ToMicroseconds();
     return ideal_next_packet_send_time_ - now;

quiche/quic/core/congestion_control/pacing_sender.h

diff --git a/quiche/quic/core/congestion_control/pacing_sender.h b/quiche/quic/core/congestion_control/pacing_sender.h
index e391fc4..214b2670 100644
--- a/quiche/quic/core/congestion_control/pacing_sender.h
+++ b/quiche/quic/core/congestion_control/pacing_sender.h
@@ -46,10 +46,6 @@
 
   void set_remove_non_initial_burst() { remove_non_initial_burst_ = true; }
 
-  void set_alarm_granularity(QuicTime::Delta alarm_granularity) {
-    alarm_granularity_ = alarm_granularity;
-  }
-
   QuicBandwidth max_pacing_rate() const { return max_pacing_rate_; }
 
   void OnCongestionEvent(bool rtt_updated, QuicByteCount bytes_in_flight,
@@ -101,11 +97,6 @@
   // is consumed after burst_tokens_ ran out.
   uint32_t lumpy_tokens_;
 
-  // If the next send time is within alarm_granularity_, send immediately.
-  // TODO(fayang): Remove alarm_granularity_ when deprecating
-  // quic_offload_pacing_to_usps2 flag.
-  QuicTime::Delta alarm_granularity_;
-
   // Indicates whether pacing throttles the sending. If true, make up for lost
   // time.
   bool pacing_limited_;

quiche/quic/core/quic_connection.cc

diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc
index f7dcd48..6a1e0a8 100644
--- a/quiche/quic/core/quic_connection.cc
+++ b/quiche/quic/core/quic_connection.cc
@@ -361,11 +361,6 @@
   // TODO(ianswett): Supply the NetworkChangeVisitor as a constructor argument
   // and make it required non-null, because it's always used.
   sent_packet_manager_.SetNetworkChangeVisitor(this);
-  if (GetQuicRestartFlag(quic_offload_pacing_to_usps2)) {
-    sent_packet_manager_.SetPacingAlarmGranularity(QuicTime::Delta::Zero());
-    release_time_into_future_ =
-        QuicTime::Delta::FromMilliseconds(kMinReleaseTimeIntoFutureMs);
-  }
   // Allow the packet writer to potentially reduce the packet size to a value
   // even smaller than kDefaultMaxPacketSize.
   SetMaxPacketLength(perspective_ == Perspective::IS_SERVER

quiche/quic/core/quic_flags_list.h

diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index b56587a..bb7d09d 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -5,8 +5,6 @@
 // This file is autogenerated by the QUICHE Copybara export script.
 
 #ifdef QUIC_FLAG
-
-QUIC_FLAG(quic_restart_flag_quic_offload_pacing_to_usps2, false)
 // A testonly reloadable flag that will always default to false.
 QUIC_FLAG(quic_reloadable_flag_http2_testonly_default_false, false)
 // A testonly reloadable flag that will always default to false.

quiche/quic/core/quic_sent_packet_manager.h

diff --git a/quiche/quic/core/quic_sent_packet_manager.h b/quiche/quic/core/quic_sent_packet_manager.h
index 4d83546..e2a707d 100644
--- a/quiche/quic/core/quic_sent_packet_manager.h
+++ b/quiche/quic/core/quic_sent_packet_manager.h
@@ -358,10 +358,6 @@
 
   void SetDebugDelegate(DebugDelegate* debug_delegate);
 
-  void SetPacingAlarmGranularity(QuicTime::Delta alarm_granularity) {
-    pacing_sender_.set_alarm_granularity(alarm_granularity);
-  }
-
   QuicPacketNumber GetLargestObserved() const {
     return unacked_packets_.largest_acked();
   }