Land Recent QUIC changes.

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 "base/logging.h"
 #include "base/stl_util.h"
+#include "net/quic/quic_ack_notifier_manager.h"
 
 using std::make_pair;
 
 // TODO(rtenneti): Remove this.
 // Do not flip this flag until the flakiness of the
 // net/tools/quic/end_to_end_test is fixed.
 // If true, then QUIC connections will track the retransmission history of a
 // packet so that an ack of a previous transmission will ack the data of all
 // other transmissions.
 bool FLAGS_track_retransmission_history = false;
@@ skipping 32 matching lines @@
     unacked_fec_packets_.insert(make_pair(
         serialized_packet.sequence_number, serialized_time));
     return;
   }
 
   if (serialized_packet.retransmittable_frames == NULL) {
     // Don't track ack/congestion feedback packets.
     return;
   }
 
+  ack_notifier_manager_.OnSerializedPacket(serialized_packet);
+
   DCHECK(unacked_packets_.empty() ||
          unacked_packets_.rbegin()->first <
          serialized_packet.sequence_number);
   unacked_packets_[serialized_packet.sequence_number] =
       serialized_packet.retransmittable_frames;
   retransmission_map_[serialized_packet.sequence_number] =
       RetransmissionInfo(serialized_packet.sequence_number,
                          serialized_packet.sequence_number_length);
 }
 
@@ skipping 10 matching lines @@
 
   RetransmissionInfo retransmission_info(
       new_sequence_number, GetSequenceNumberLength(old_sequence_number));
   retransmission_info.number_retransmissions =
       retransmission_map_[old_sequence_number].number_retransmissions + 1;
   retransmission_map_.erase(old_sequence_number);
   retransmission_map_[new_sequence_number] = retransmission_info;
 
   RetransmittableFrames* frames = unacked_packets_[old_sequence_number];
   DCHECK(frames);
+
+  // A notifier may be waiting to hear about ACKs for the original sequence
+  // number. Inform them that the sequence number has changed.
+  ack_notifier_manager_.UpdateSequenceNumber(old_sequence_number,
+                                             new_sequence_number);
+
+

[wtc, 2013/10/01 14:06:59]

Nit: delete one blank line.

[ramant (doing other things), 2013/10/01 22:29:32]

Done.

   if (FLAGS_track_retransmission_history) {
     // We keep the old packet in the unacked packet list until it, or one of
     // the retransmissions of it are acked.
     unacked_packets_[old_sequence_number] = NULL;
   } else {
     unacked_packets_.erase(old_sequence_number);
   }
   unacked_packets_[new_sequence_number] = frames;
 
   if (!FLAGS_track_retransmission_history) {
@@ skipping 18 matching lines @@
 
   DCHECK(HasRetransmittableFrames(new_sequence_number));
 }
 
 void QuicSentPacketManager::OnIncomingAck(
     const ReceivedPacketInfo& received_info,
     bool is_truncated_ack,
     SequenceNumberSet* acked_packets) {
   HandleAckForSentPackets(received_info, is_truncated_ack, acked_packets);
   HandleAckForSentFecPackets(received_info, acked_packets);
+
+  if (acked_packets->size() > 0) {
+    // The AckNotifierManager should be informed of every ACKed sequence number.
+    ack_notifier_manager_.OnIncomingAck(*acked_packets);
+  }
 }
 
 void QuicSentPacketManager::DiscardUnackedPacket(
     QuicPacketSequenceNumber sequence_number) {
   MarkPacketReceivedByPeer(sequence_number);
 }
 
 void QuicSentPacketManager::HandleAckForSentPackets(
     const ReceivedPacketInfo& received_info,
     bool is_truncated_ack,
@@ skipping 347 matching lines @@
 SequenceNumberSet QuicSentPacketManager::GetUnackedPackets() const {
   SequenceNumberSet unacked_packets;
   for (UnackedPacketMap::const_iterator it = unacked_packets_.begin();
        it != unacked_packets_.end(); ++it) {
     unacked_packets.insert(it->first);
   }
   return unacked_packets;
 }
 
 }  // namespace net