Land Recent QUIC Changes until 03/15/2015.

net/quic/quic_sent_packet_manager.cc

 // Copyright 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/quic_sent_packet_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 120 matching lines @@
       ContainsQuicTag(config.ReceivedConnectionOptions(), kTBBR)) {
     if (FLAGS_quic_recent_min_rtt_window_s > 0) {
       rtt_stats_.set_recent_min_rtt_window(
           QuicTime::Delta::FromSeconds(FLAGS_quic_recent_min_rtt_window_s));
     }
     send_algorithm_.reset(SendAlgorithmInterface::Create(
         clock_, &rtt_stats_, kBBR, stats_, initial_congestion_window_));
   }
   if (config.HasReceivedConnectionOptions() &&
       ContainsQuicTag(config.ReceivedConnectionOptions(), kRENO)) {
+    if (ContainsQuicTag(config.ReceivedConnectionOptions(), kBYTE)) {
+      send_algorithm_.reset(SendAlgorithmInterface::Create(
+          clock_, &rtt_stats_, kRenoBytes, stats_, initial_congestion_window_));
+    } else {
+      send_algorithm_.reset(SendAlgorithmInterface::Create(
+          clock_, &rtt_stats_, kReno, stats_, initial_congestion_window_));
+    }
+  } else if (config.HasReceivedConnectionOptions() &&
+             ContainsQuicTag(config.ReceivedConnectionOptions(), kBYTE)) {
     send_algorithm_.reset(SendAlgorithmInterface::Create(
-        clock_, &rtt_stats_, kReno, stats_, initial_congestion_window_));
+        clock_, &rtt_stats_, kCubicBytes, stats_, initial_congestion_window_));
   }
   EnablePacing();
 
   if (HasClientSentConnectionOption(config, k1CON)) {
     send_algorithm_->SetNumEmulatedConnections(1);
   }
   if (HasClientSentConnectionOption(config, kNCON)) {
     n_connection_simulation_ = true;
   }
   if (HasClientSentConnectionOption(config, kNTLP)) {
@@ skipping 772 matching lines @@
 
 QuicPacketCount QuicSentPacketManager::GetSlowStartThresholdInTcpMss() const {
   return send_algorithm_->GetSlowStartThreshold() / kDefaultTCPMSS;
 }
 
 void QuicSentPacketManager::OnSerializedPacket(
     const SerializedPacket& serialized_packet) {
   ack_notifier_manager_.OnSerializedPacket(serialized_packet);
 }
 
+void QuicSentPacketManager::CancelRetransmissionsForStream(
+    QuicStreamId stream_id) {
+  unacked_packets_.CancelRetransmissionsForStream(stream_id);
+  PendingRetransmissionMap::iterator it = pending_retransmissions_.begin();
+  while (it != pending_retransmissions_.end()) {
+    if (HasRetransmittableFrames(it->first)) {
+      ++it;
+      continue;
+    }
+    it = pending_retransmissions_.erase(it);
+  }
+}
+
 void QuicSentPacketManager::EnablePacing() {
   // TODO(ianswett): Replace with a method which wraps the send algorithm in a
   // pacer every time a new algorithm is set.
   if (using_pacing_) {
     return;
   }
 
   // Set up a pacing sender with a 1 millisecond alarm granularity, the same as
   // the default granularity of the Linux kernel's FQ qdisc.
   using_pacing_ = true;
   send_algorithm_.reset(
       new PacingSender(send_algorithm_.release(),
                        QuicTime::Delta::FromMilliseconds(1),
                        kInitialUnpacedBurst));
 }
 
 }  // namespace net