Land Recent QUIC Changes until 2/21/2015.

net/quic/quic_unacked_packet_map.cc

 // Copyright 2014 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_unacked_packet_map.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "net/quic/quic_connection_stats.h"
 #include "net/quic/quic_utils_chromium.h"
@@ skipping 32 matching lines @@
     bool set_in_flight) {
   QuicPacketSequenceNumber sequence_number = packet.sequence_number;
   LOG_IF(DFATAL, largest_sent_packet_ > sequence_number);
   DCHECK_GE(sequence_number, least_unacked_ + unacked_packets_.size());
   while (least_unacked_ + unacked_packets_.size() < sequence_number) {
     unacked_packets_.push_back(TransmissionInfo());
     unacked_packets_.back().is_unackable = true;
   }
 
   TransmissionInfo info(packet.retransmittable_frames,
-                        packet.sequence_number_length,
-                        transmission_type,
-                        sent_time);
-  info.is_fec_packet = packet.is_fec_packet;
-
+                        packet.sequence_number_length, transmission_type,
+                        sent_time, bytes_sent, packet.is_fec_packet);
   if (old_sequence_number == 0) {
     if (packet.retransmittable_frames != nullptr &&
         packet.retransmittable_frames->HasCryptoHandshake() == IS_HANDSHAKE) {
       ++pending_crypto_packet_count_;
     }
   } else {
     TransferRetransmissionInfo(
         old_sequence_number, sequence_number, transmission_type, &info);
   }
 
   largest_sent_packet_ = sequence_number;
   if (set_in_flight) {
     bytes_in_flight_ += bytes_sent;
-    info.bytes_sent = bytes_sent;
     info.in_flight = true;
   }
   unacked_packets_.push_back(info);
 }
 
 void QuicUnackedPacketMap::RemoveObsoletePackets() {
   while (!unacked_packets_.empty()) {
     if (!IsPacketRemovable(least_unacked_, unacked_packets_.front())) {
       break;
     }
     unacked_packets_.pop_front();
     ++least_unacked_;
   }
 }
 
 void QuicUnackedPacketMap::TransferRetransmissionInfo(
     QuicPacketSequenceNumber old_sequence_number,
     QuicPacketSequenceNumber new_sequence_number,
     TransmissionType transmission_type,
     TransmissionInfo* info) {
   DCHECK_GE(old_sequence_number, least_unacked_);
   DCHECK_LT(old_sequence_number, least_unacked_ + unacked_packets_.size());
   DCHECK_GE(new_sequence_number, least_unacked_ + unacked_packets_.size());
   DCHECK_NE(NOT_RETRANSMISSION, transmission_type);
 
-  // TODO(ianswett): Discard and lose the packet lazily instead of immediately.
   TransmissionInfo* transmission_info =
       &unacked_packets_.at(old_sequence_number - least_unacked_);
   RetransmittableFrames* frames = transmission_info->retransmittable_frames;
   transmission_info->retransmittable_frames = nullptr;
   LOG_IF(DFATAL, frames == nullptr)
       << "Attempt to retransmit packet with no "
       << "retransmittable frames: " << old_sequence_number;
 
   // Only keep one transmission older than largest observed, because only the
   // most recent is expected to possibly be a spurious retransmission.
@@ skipping 86 matching lines @@
   DCHECK_GE(sequence_number, least_unacked_);
   DCHECK_LT(sequence_number, least_unacked_ + unacked_packets_.size());
   TransmissionInfo* info = &unacked_packets_[sequence_number - least_unacked_];
   SequenceNumberList* all_transmissions = info->all_transmissions;
   if (all_transmissions == nullptr) {
     MaybeRemoveRetransmittableFrames(info);
     return;
   }
   // TODO(ianswett): Consider adding a check to ensure there are retransmittable
   // frames associated with this packet.
-  for (SequenceNumberList::const_iterator it = all_transmissions->begin();
-       it != all_transmissions->end(); ++it) {
+  for (QuicPacketSequenceNumber sequence_number : *all_transmissions) {
     TransmissionInfo* transmission_info =
-        &unacked_packets_[*it - least_unacked_];
+        &unacked_packets_[sequence_number - least_unacked_];
     MaybeRemoveRetransmittableFrames(transmission_info);
     transmission_info->all_transmissions = nullptr;
   }
   delete all_transmissions;
 }
 
 void QuicUnackedPacketMap::RemoveAckability(TransmissionInfo* info) {
   DCHECK(info->retransmittable_frames == nullptr);
   info->is_unackable = true;
   SequenceNumberList* all_transmissions = info->all_transmissions;
   if (all_transmissions == nullptr) {
     return;
   }
-  for (SequenceNumberList::const_iterator it = all_transmissions->begin();
-       it != all_transmissions->end(); ++it) {
+  for (QuicPacketSequenceNumber sequence_number : *all_transmissions) {
     TransmissionInfo* transmission_info =
-        &unacked_packets_[*it - least_unacked_];
+        &unacked_packets_[sequence_number - least_unacked_];
     transmission_info->all_transmissions = nullptr;
     transmission_info->is_unackable = true;
   }
   delete all_transmissions;
 }
 
 void QuicUnackedPacketMap::MaybeRemoveRetransmittableFrames(
     TransmissionInfo* transmission_info) {
   if (transmission_info->retransmittable_frames != nullptr) {
     if (transmission_info->retransmittable_frames->HasCryptoHandshake()
@@ skipping 13 matching lines @@
 
 bool QuicUnackedPacketMap::IsPacketUsefulForMeasuringRtt(
     QuicPacketSequenceNumber sequence_number,
     const TransmissionInfo& info) const {
   // Packet can be used for RTT measurement if it may yet be acked as the
   // largest observed packet by the receiver.
   return !info.is_unackable && sequence_number > largest_observed_;
 }
 
 bool QuicUnackedPacketMap::IsPacketUsefulForCongestionControl(
-    QuicPacketSequenceNumber sequence_number,
     const TransmissionInfo& info) const {
   // Packet contributes to congestion control if it is considered inflight.
   return info.in_flight;
 }
 
 bool QuicUnackedPacketMap::IsPacketUsefulForRetransmittableData(
-    QuicPacketSequenceNumber sequence_number,
     const TransmissionInfo& info) const {
   // Packet may have retransmittable frames, or the data may have been
   // retransmitted with a new sequence number.
   return info.retransmittable_frames != nullptr ||
          info.all_transmissions != nullptr;
 }
 
 bool QuicUnackedPacketMap::IsPacketUseless(
     QuicPacketSequenceNumber sequence_number,
     const TransmissionInfo& info) const {
   return !IsPacketUsefulForMeasuringRtt(sequence_number, info) &&
-         !IsPacketUsefulForCongestionControl(sequence_number, info) &&
-         !IsPacketUsefulForRetransmittableData(sequence_number, info);
+         !IsPacketUsefulForCongestionControl(info) &&
+         !IsPacketUsefulForRetransmittableData(info);
 }
 
 bool QuicUnackedPacketMap::IsPacketRemovable(
     QuicPacketSequenceNumber sequence_number,
     const TransmissionInfo& info) const {
   return (!IsPacketUsefulForMeasuringRtt(sequence_number, info) ||
           unacked_packets_.size() > kMaxTcpCongestionWindow) &&
-         !IsPacketUsefulForCongestionControl(sequence_number, info) &&
-         !IsPacketUsefulForRetransmittableData(sequence_number, info);
+         !IsPacketUsefulForCongestionControl(info) &&
+         !IsPacketUsefulForRetransmittableData(info);
 }
 
 bool QuicUnackedPacketMap::IsUnacked(
     QuicPacketSequenceNumber sequence_number) const {
   if (sequence_number < least_unacked_ ||
       sequence_number >= least_unacked_ + unacked_packets_.size()) {
     return false;
   }
   return !IsPacketUseless(sequence_number,
                           unacked_packets_[sequence_number - least_unacked_]);
@@ skipping 83 matching lines @@
 bool QuicUnackedPacketMap::HasUnackedRetransmittableFrames() const {
   for (UnackedPacketMap::const_reverse_iterator it =
            unacked_packets_.rbegin(); it != unacked_packets_.rend(); ++it) {
     if (it->in_flight && it->retransmittable_frames) {
       return true;
     }
   }
   return false;
 }
 
-QuicPacketSequenceNumber
-QuicUnackedPacketMap::GetLeastUnacked() const {
+QuicPacketSequenceNumber QuicUnackedPacketMap::GetLeastUnacked() const {
   return least_unacked_;
 }
 
-void QuicUnackedPacketMap::RestoreInFlight(
-    QuicPacketSequenceNumber sequence_number) {
-  DCHECK_GE(sequence_number, least_unacked_);
-  DCHECK_LT(sequence_number, least_unacked_ + unacked_packets_.size());
-  TransmissionInfo* info = &unacked_packets_[sequence_number - least_unacked_];
-  DCHECK(!info->in_flight);
-  DCHECK_NE(0u, info->bytes_sent);
-  DCHECK(info->sent_time.IsInitialized());
-
-  bytes_in_flight_ += info->bytes_sent;
-  info->in_flight = true;
-}
-
 }  // namespace net