Land Recent QUIC Changes.

net/quic/quic_sent_packet_manager.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_SENT_PACKET_MANAGER_H_
 #define NET_QUIC_QUIC_SENT_PACKET_MANAGER_H_
 
 #include <deque>
 #include <list>
 #include <map>
@@ skipping 188 matching lines @@
     RTO_MODE,
     TLP_MODE,
     HANDSHAKE_MODE,
   };
 
   struct TransmissionInfo {
     TransmissionInfo()
         : retransmittable_frames(NULL),
           sequence_number_length(PACKET_1BYTE_SEQUENCE_NUMBER),
           sent_time(QuicTime::Zero()),
-          previous_transmissions(NULL) { }
+          previous_transmissions(NULL),
+          pending(false) { }
     TransmissionInfo(RetransmittableFrames* retransmittable_frames,
                      QuicSequenceNumberLength sequence_number_length)
         : retransmittable_frames(retransmittable_frames),
           sequence_number_length(sequence_number_length),
           sent_time(QuicTime::Zero()),
-          previous_transmissions(NULL) {
+          previous_transmissions(NULL),
+          pending(false) {
     }
 
     RetransmittableFrames* retransmittable_frames;
     QuicSequenceNumberLength sequence_number_length;
     // Zero when the packet is serialized, non-zero once it's sent.
     QuicTime sent_time;
     // Stores all previous transmissions if the packet has been retransmitted,
     // and is NULL otherwise.
     SequenceNumberSet* previous_transmissions;
+    // Pending packets have not been abandoned or lost.
+    bool pending;
   };
 
   typedef linked_hash_map<QuicPacketSequenceNumber,
                           TransmissionInfo> UnackedPacketMap;
   typedef linked_hash_map<QuicPacketSequenceNumber,
                           TransmissionType> PendingRetransmissionMap;
 
   static bool HasCryptoHandshake(const TransmissionInfo& transmission_info);
 
+  // Returns true if there are unacked packets that are pending.
+  bool HasPendingPackets() const;
+
   // Process the incoming ack looking for newly ack'd data packets.
   void HandleAckForSentPackets(const ReceivedPacketInfo& received_info);
 
   // Called when a packet is timed out, such as an RTO.  Removes the bytes from
   // the congestion manager, but does not change the congestion window size.
-  virtual void OnPacketAbandoned(QuicPacketSequenceNumber sequence_number);
+  virtual void OnPacketAbandoned(UnackedPacketMap::iterator it);
 
   // Returns the current retransmission mode.
   RetransmissionTimeoutMode GetRetransmissionMode() const;
 
   // Retransmits all crypto stream packets.
   void RetransmitCryptoPackets();
 
   // Retransmits the oldest pending packet.
   void RetransmitOldestPacket();
 
@@ skipping 27 matching lines @@
 
   // Removes entries from the unacked packet map.
   void DiscardPacket(QuicPacketSequenceNumber sequence_number);
 
   // Request that |sequence_number| be retransmitted after the other pending
   // retransmissions.  Does not add it to the retransmissions if it's already
   // a pending retransmission.
   void MarkForRetransmission(QuicPacketSequenceNumber sequence_number,
                              TransmissionType transmission_type);
 
-  // Returns the length of the serialized sequence number for
-  // the packet |sequence_number|.
-  QuicSequenceNumberLength GetSequenceNumberLength(
-      QuicPacketSequenceNumber sequence_number) const;
-
   // Clears up to |num_to_clear| previous transmissions in order to make room
   // in the ack frame for new acks.
   void ClearPreviousRetransmissions(size_t num_to_clear);
 
   void CleanupPacketHistory();
 
   // Removes |sequence_number| as a previous transmission of any other packets.
   void RemovePreviousTransmission(QuicPacketSequenceNumber sequence_number);
 
   // Newly serialized retransmittable and fec packets are added to this map,
@@ skipping 17 matching lines @@
   // An AckNotifier can register to be informed when ACKs have been received for
   // all packets that a given block of data was sent in. The AckNotifierManager
   // maintains the currently active notifiers.
   AckNotifierManager ack_notifier_manager_;
 
   const QuicClock* clock_;
   scoped_ptr<SendAlgorithmInterface> send_algorithm_;
   // Tracks the send time, size, and nack count of sent packets.  Packets are
   // removed after 5 seconds and they've been removed from pending_packets_.
   SendAlgorithmInterface::SentPacketsMap packet_history_map_;
-  // Packets that are outstanding and have not been abandoned or lost.
-  SequenceNumberSet pending_packets_;
   QuicTime::Delta rtt_sample_;  // RTT estimate from the most recent ACK.
   // Number of outstanding crypto handshake packets.
   size_t pending_crypto_packet_count_;
   // Number of times the RTO timer has fired in a row without receiving an ack.
   size_t consecutive_rto_count_;
   // Number of times the tail loss probe has been sent.
   size_t consecutive_tlp_count_;
   // Number of times the crypto handshake has been retransmitted.
   size_t consecutive_crypto_retransmission_count_;
   // Maximum number of tail loss probes to send before firing an RTO.
   size_t max_tail_loss_probes_;
   bool using_pacing_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSentPacketManager);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SENT_PACKET_MANAGER_H_