Landing Recent QUIC changes until 2016-03-15 16:26 UTC

net/quic/congestion_control/pacing_sender.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/congestion_control/pacing_sender.h"
 
 using std::min;
 
 namespace net {
 
@@ skipping 99 matching lines @@
 void PacingSender::OnRetransmissionTimeout(bool packets_retransmitted) {
   sender_->OnRetransmissionTimeout(packets_retransmitted);
 }
 
 void PacingSender::OnConnectionMigration() {
   sender_->OnConnectionMigration();
 }
 
 QuicTime::Delta PacingSender::TimeUntilSend(
     QuicTime now,
-    QuicByteCount bytes_in_flight,
-    HasRetransmittableData has_retransmittable_data) const {
+    QuicByteCount bytes_in_flight) const {
   QuicTime::Delta time_until_send =
-      sender_->TimeUntilSend(now, bytes_in_flight, has_retransmittable_data);
+      sender_->TimeUntilSend(now, bytes_in_flight);
   if (burst_tokens_ > 0 || bytes_in_flight == 0) {
     // Don't pace if we have burst tokens available or leaving quiescence.
     return time_until_send;
   }
 
   if (!time_until_send.IsZero()) {
     DCHECK(time_until_send.IsInfinite());
     // The underlying sender prevents sending.
     return time_until_send;
   }
 
-  if (has_retransmittable_data == NO_RETRANSMITTABLE_DATA) {
-    // Don't pace ACK packets, since they do not count against CWND and do not
-    // cause CWND to grow.
-    return QuicTime::Delta::Zero();
-  }
-
   // If the next send time is within the alarm granularity, send immediately.
   if (ideal_next_packet_send_time_ > now.Add(alarm_granularity_)) {
     DVLOG(1) << "Delaying packet: "
              << ideal_next_packet_send_time_.Subtract(now).ToMicroseconds();
     was_last_send_delayed_ = true;
     return ideal_next_packet_send_time_.Subtract(now);
   }
 
   DVLOG(1) << "Sending packet now";
   return QuicTime::Delta::Zero();
@@ skipping 25 matching lines @@
 
 QuicByteCount PacingSender::GetSlowStartThreshold() const {
   return sender_->GetSlowStartThreshold();
 }
 
 CongestionControlType PacingSender::GetCongestionControlType() const {
   return sender_->GetCongestionControlType();
 }
 
 }  // namespace net