Landing Recent QUIC changes until 01/26/2016 18:14 UTC

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 396 matching lines @@
   ++stats_->packets_spuriously_retransmitted;
   if (debug_delegate_ != nullptr) {
     debug_delegate_->OnSpuriousPacketRetransmission(info.transmission_type,
                                                     info.bytes_sent);
   }
 }
 
 void QuicSentPacketManager::RecordSpuriousRetransmissions(
     const TransmissionInfo& info,
     QuicPacketNumber acked_packet_number) {
-  if (unacked_packets_.track_single_retransmission()) {
-    QuicPacketNumber retransmission = info.retransmission;
-    while (retransmission != 0) {
-      const TransmissionInfo& retransmit_info =
-          unacked_packets_.GetTransmissionInfo(retransmission);
-      retransmission = retransmit_info.retransmission;
-      RecordOneSpuriousRetransmission(retransmit_info);
-    }
-    return;
-  }
-  const PacketNumberList* all_transmissions = info.all_transmissions;
-  for (PacketNumberList::const_reverse_iterator it =
-           all_transmissions->rbegin();
-       it != all_transmissions->rend() && *it > acked_packet_number; ++it) {
-    // ianswett: Prevents crash in b/20552846.
-    if (*it < unacked_packets_.GetLeastUnacked() ||
-        *it > unacked_packets_.largest_sent_packet()) {
-      QUIC_BUG << "Retransmission out of range:" << *it
-               << " least unacked:" << unacked_packets_.GetLeastUnacked()
-               << " largest sent:" << unacked_packets_.largest_sent_packet();
-      return;
-    }
+  QuicPacketNumber retransmission = info.retransmission;
+  while (retransmission != 0) {
     const TransmissionInfo& retransmit_info =
-        unacked_packets_.GetTransmissionInfo(*it);
-
+        unacked_packets_.GetTransmissionInfo(retransmission);
+    retransmission = retransmit_info.retransmission;
     RecordOneSpuriousRetransmission(retransmit_info);
   }
 }
 
 bool QuicSentPacketManager::HasPendingRetransmissions() const {
   return !pending_retransmissions_.empty();
 }
 
 PendingRetransmission QuicSentPacketManager::NextPendingRetransmission() {
   QUIC_BUG_IF(pending_retransmissions_.empty())
@@ skipping 21 matching lines @@
                                transmission_info.retransmittable_frames,
                                transmission_info.has_crypto_handshake,
                                transmission_info.needs_padding,
                                transmission_info.encryption_level,
                                transmission_info.packet_number_length);
 }
 
 QuicPacketNumber QuicSentPacketManager::GetNewestRetransmission(
     QuicPacketNumber packet_number,
     const TransmissionInfo& transmission_info) const {
-  if (unacked_packets_.track_single_retransmission()) {
-    QuicPacketNumber retransmission = transmission_info.retransmission;
-    while (retransmission != 0) {
-      packet_number = retransmission;
-      retransmission =
-          unacked_packets_.GetTransmissionInfo(retransmission).retransmission;
-    }
-    return packet_number;
-  } else {
-    return transmission_info.all_transmissions == nullptr
-               ? packet_number
-               : *transmission_info.all_transmissions->rbegin();
+  QuicPacketNumber retransmission = transmission_info.retransmission;
+  while (retransmission != 0) {
+    packet_number = retransmission;
+    retransmission =
+        unacked_packets_.GetTransmissionInfo(retransmission).retransmission;
   }
+  return packet_number;
 }
 
 void QuicSentPacketManager::MarkPacketNotRetransmittable(
     QuicPacketNumber packet_number,
     QuicTime::Delta ack_delay_time) {
   if (!unacked_packets_.IsUnacked(packet_number)) {
     return;
   }
 
   const TransmissionInfo& transmission_info =
@@ skipping 194 matching lines @@
   QuicPacketNumber packet_number = unacked_packets_.GetLeastUnacked();
   for (QuicUnackedPacketMap::const_iterator it = unacked_packets_.begin();
        it != unacked_packets_.end(); ++it, ++packet_number) {
     if (!it->retransmittable_frames.empty() &&
         pending_timer_transmission_count_ < kMaxRetransmissionsOnTimeout) {
       MarkForRetransmission(packet_number, RTO_RETRANSMISSION);
       ++pending_timer_transmission_count_;
     }
     // Abandon non-retransmittable data that's in flight to ensure it doesn't
     // fill up the congestion window.
-    const bool has_retransmissions =
-        unacked_packets_.track_single_retransmission()
-            ? it->retransmission != 0
-            : it->all_transmissions != nullptr;
+    const bool has_retransmissions = it->retransmission != 0;
     if (it->retransmittable_frames.empty() && it->in_flight &&
         !has_retransmissions) {
       // Log only for non-retransmittable data.
       // Retransmittable data is marked as lost during loss detection, and will
       // be logged later.
       unacked_packets_.RemoveFromInFlight(packet_number);
       if (FLAGS_quic_log_loss_event && debug_delegate_ != nullptr) {
         debug_delegate_->OnPacketLoss(packet_number, RTO_RETRANSMISSION,
                                       clock_->Now());
       }
@@ skipping 309 matching lines @@
 TransmissionInfo* QuicSentPacketManager::GetMutableTransmissionInfo(
     QuicPacketNumber packet_number) {
   return unacked_packets_.GetMutableTransmissionInfo(packet_number);
 }
 
 void QuicSentPacketManager::RemoveObsoletePackets() {
   unacked_packets_.RemoveObsoletePackets();
 }
 
 }  // namespace net