commit 5a094328f4081b068158be8ce141c99174d38d1b
author ianswett <ianswett@google.com> Wed Jan 29 07:01:43 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Jan 29 07:02:28 2020 -0800
tree 1d7a7c3d5a457f54b92a382d00d7a4aa306982b8
parent 278efaec3531ef0554ec209bd66cb8ebb5ada7a5

gfe-relnote: Inline QuicConnection::MaybeSetAckAlarmTo because it's only used in one place.  No functional change, not flag protected.

PiperOrigin-RevId: 292133930
Change-Id: I491f0ae0e2fbc760cc2078a35e1dca9235d16dee

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index f54609a..7e9f645 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -3207,12 +3207,6 @@
   mtu_discovery_alarm_->Set(clock_->ApproximateNow());
 }
 
-void QuicConnection::MaybeSetAckAlarmTo(QuicTime time) {
-  if (!ack_alarm_->IsSet() || ack_alarm_->deadline() > time) {
-    ack_alarm_->Update(time, QuicTime::Delta::Zero());
-  }
-}
-
 QuicConnection::ScopedPacketFlusher::ScopedPacketFlusher(
     QuicConnection* connection)
     : connection_(connection),
@@ -3241,8 +3235,9 @@
         // Cancel ACK alarm if connection is write blocked, and ACK will be
         // sent when connection gets unblocked.
         connection_->ack_alarm_->Cancel();
-      } else {
-        connection_->MaybeSetAckAlarmTo(ack_timeout);
+      } else if (!connection_->ack_alarm_->IsSet() ||
+                 connection_->ack_alarm_->deadline() > ack_timeout) {
+        connection_->ack_alarm_->Update(ack_timeout, QuicTime::Delta::Zero());
       }
     }
     if (connection_->ack_alarm_->IsSet() &&

quic/core/quic_connection.h

diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h
index a10de5b..5bb3589 100644
--- a/quic/core/quic_connection.h
+++ b/quic/core/quic_connection.h
@@ -1089,9 +1089,6 @@
   // |sent_packet_number| is the recently sent packet number.
   void MaybeSetMtuAlarm(QuicPacketNumber sent_packet_number);
 
-  // Sets ack alarm to |time| if ack alarm is not set or the deadline > time.
-  void MaybeSetAckAlarmTo(QuicTime time);
-
   HasRetransmittableData IsRetransmittable(const SerializedPacket& packet);
   bool IsTerminationPacket(const SerializedPacket& packet);